CLI: Fixed handling of stdout if callback is specified, see #724

protobufjs · Mar 24, 2017 · 16adff0 · 16adff0
1 parent 6423a41
commit 16adff0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/cli/pbjs.js b/cli/pbjs.js
@@ -275,15 +275,19 @@ exports.main = function main(args, callback) {
                     return callback(err);
                 throw err;
             }
-            if (output !== "") {
+            try {
                 if (argv.out)
                     fs.writeFileSync(argv.out, output, { encoding: "utf8" });
                 else if (!callback)
                     process.stdout.write(output, "utf8");
+                return callback
+                    ? callback(null, output)
+                    : undefined;
+            } catch (err) {
+                if (callback)
+                    return callback(err);
+                throw err;
             }
-            return callback
-                ? callback(null, output)
-                : undefined;
         });
     }
 

diff --git a/cli/pbts.js b/cli/pbts.js
@@ -140,16 +140,15 @@ exports.main = function(args, callback) {
 
             try {
                 if (argv.out)
-                    fs.writeFileSync(argv.out, output);
-                else
+                    fs.writeFileSync(argv.out, output, { encoding: "utf8" });
+                else if (!callback)
                     process.stdout.write(output, "utf8");
-                if (callback)
-                    callback(null); // eslint-disable-line callback-return
+                return callback
+                    ? callback(null, output)
+                    : undefined;
             } catch (err) {
-                if (callback) {
-                    callback(err);
-                    return;
-                }
+                if (callback)
+                    return callback(err);
                 throw err;
             }
         });