files - use proper flag for writing in extfs

Benjamin Pasero · Benjamin Pasero · commit dbdb424ba8a9 · 2019-03-29T15:17:05.000+01:00
diff --git a/src/vs/base/node/extfs.ts b/src/vs/base/node/extfs.ts
@@ -366,18 +366,23 @@ export interface IWriteFileOptions {
 	};
 }
 
+interface IEnsuredWriteFileOptions extends IWriteFileOptions {
+	mode: number;
+	flag: string;
+}
+
 let canFlush = true;
 export function writeFileAndFlush(path: string, data: string | Buffer | NodeJS.ReadableStream | Uint8Array, options: IWriteFileOptions, callback: (error?: Error) => void): void {
-	options = ensureOptions(options);
+	const ensuredOptions = ensureWriteOptions(options);
 
 	if (typeof data === 'string' || Buffer.isBuffer(data) || data instanceof Uint8Array) {
-		doWriteFileAndFlush(path, data, options, callback);
+		doWriteFileAndFlush(path, data, ensuredOptions, callback);
 	} else {
-		doWriteFileStreamAndFlush(path, data, options, callback);
+		doWriteFileStreamAndFlush(path, data, ensuredOptions, callback);
 	}
 }
 
-function doWriteFileStreamAndFlush(path: string, reader: NodeJS.ReadableStream, options: IWriteFileOptions, callback: (error?: Error) => void): void {
+function doWriteFileStreamAndFlush(path: string, reader: NodeJS.ReadableStream, options: IEnsuredWriteFileOptions, callback: (error?: Error) => void): void {
 
 	// finish only once
 	let finished = false;
@@ -468,7 +473,7 @@ function doWriteFileStreamAndFlush(path: string, reader: NodeJS.ReadableStream,
 // not in some cache.
 //
 // See https://github.com/nodejs/node/blob/v5.10.0/lib/fs.js#L1194
-function doWriteFileAndFlush(path: string, data: string | Buffer | Uint8Array, options: IWriteFileOptions, callback: (error?: Error) => void): void {
+function doWriteFileAndFlush(path: string, data: string | Buffer | Uint8Array, options: IEnsuredWriteFileOptions, callback: (error?: Error) => void): void {
 	if (options.encoding) {
 		data = encode(data instanceof Uint8Array ? Buffer.from(data) : data, options.encoding.charset, { addBOM: options.encoding.addBOM });
 	}
@@ -478,7 +483,7 @@ function doWriteFileAndFlush(path: string, data: string | Buffer | Uint8Array, o
 	}
 
 	// Open the file with same flags and mode as fs.writeFile()
-	fs.open(path, typeof options.flag === 'string' ? options.flag : 'r', options.mode, (openError, fd) => {
+	fs.open(path, options.flag, options.mode, (openError, fd) => {
 		if (openError) {
 			return callback(openError);
 		}
@@ -506,18 +511,18 @@ function doWriteFileAndFlush(path: string, data: string | Buffer | Uint8Array, o
 }
 
 export function writeFileAndFlushSync(path: string, data: string | Buffer, options?: IWriteFileOptions): void {
-	options = ensureOptions(options);
+	const ensuredOptions = ensureWriteOptions(options);
 
-	if (options.encoding) {
-		data = encode(data, options.encoding.charset, { addBOM: options.encoding.addBOM });
+	if (ensuredOptions.encoding) {
+		data = encode(data, ensuredOptions.encoding.charset, { addBOM: ensuredOptions.encoding.addBOM });
 	}
 
 	if (!canFlush) {
-		return fs.writeFileSync(path, data, { mode: options.mode, flag: options.flag });
+		return fs.writeFileSync(path, data, { mode: ensuredOptions.mode, flag: ensuredOptions.flag });
 	}
 
 	// Open the file with same flags and mode as fs.writeFile()
-	const fd = fs.openSync(path, typeof options.flag === 'string' ? options.flag : 'r', options.mode);
+	const fd = fs.openSync(path, ensuredOptions.flag, ensuredOptions.mode);
 
 	try {
 
@@ -536,22 +541,16 @@ export function writeFileAndFlushSync(path: string, data: string | Buffer, optio
 	}
 }
 
-function ensureOptions(options?: IWriteFileOptions): IWriteFileOptions {
+function ensureWriteOptions(options?: IWriteFileOptions): IEnsuredWriteFileOptions {
 	if (!options) {
 		return { mode: 0o666, flag: 'w' };
 	}
 
-	const ensuredOptions: IWriteFileOptions = { mode: options.mode, flag: options.flag, encoding: options.encoding };
-
-	if (typeof ensuredOptions.mode !== 'number') {
-		ensuredOptions.mode = 0o666;
-	}
-
-	if (typeof ensuredOptions.flag !== 'string') {
-		ensuredOptions.flag = 'w';
-	}
-
-	return ensuredOptions;
+	return {
+		mode: typeof options.mode === 'number' ? options.mode : 0o666,
+		flag: typeof options.flag === 'string' ? options.flag : 'w',
+		encoding: options.encoding
+	};
 }
 
 /**
