fix(grep, sed, sort, uniq): Split only on newline characters (#690)

freitagbr · nfischer · commit a7ee6a20da89 · 2017-03-16T01:08:48.000-07:00
* Split on newlines only

* Only split lines if need be

* Clarify code by making use of Array.prototype.reduce
diff --git a/src/grep.js b/src/grep.js
@@ -47,12 +47,12 @@ function _grep(options, regex, files) {
     }
 
     var contents = file === '-' ? pipe : fs.readFileSync(file, 'utf8');
-    var lines = contents.split(/\r*\n/);
     if (options.nameOnly) {
       if (contents.match(regex)) {
         grep.push(file);
       }
     } else {
+      var lines = contents.split('\n');
       lines.forEach(function (line) {
         var matched = line.match(regex);
         if ((options.inverse && !matched) || (!options.inverse && matched)) {
diff --git a/src/sed.js b/src/sed.js
@@ -69,7 +69,7 @@ function _sed(options, regex, replacement, files) {
     }
 
     var contents = file === '-' ? pipe : fs.readFileSync(file, 'utf8');
-    var lines = contents.split(/\r*\n/);
+    var lines = contents.split('\n');
     var result = lines.map(function (line) {
       return line.replace(regex, replacement);
     }).join('\n');
diff --git a/src/sort.js b/src/sort.js
@@ -67,19 +67,17 @@ function _sort(options, files) {
     files.unshift('-');
   }
 
-  var lines = [];
-  files.forEach(function (file) {
+  var lines = files.reduce(function (accum, file) {
     if (!fs.existsSync(file) && file !== '-') {
       // exit upon any sort of error
       common.error('no such file or directory: ' + file);
     }
 
     var contents = file === '-' ? pipe : fs.readFileSync(file, 'utf8');
-    lines = lines.concat(contents.trimRight().split(/\r*\n/));
-  });
+    return accum.concat(contents.trimRight().split('\n'));
+  }, []);
 
-  var sorted;
-  sorted = lines.sort(options.numerical ? numericalCmp : unixCmp);
+  var sorted = lines.sort(options.numerical ? numericalCmp : unixCmp);
 
   if (options.reverse) {
     sorted = sorted.reverse();
diff --git a/src/uniq.js b/src/uniq.js
@@ -44,7 +44,7 @@ function _uniq(options, input, output) {
 
   var lines = (input ? fs.readFileSync(input, 'utf8') : pipe).
               trimRight().
-              split(/\r*\n/);
+              split('\n');
 
   var compare = function (a, b) {
     return options.ignoreCase ?

Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,12 @@ function _grep(options, regex, files) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`var contents = file === '-' ? pipe : fs.readFileSync(file, 'utf8');`
`50`		`- var lines = contents.split(/\r*\n/);`
`51`	`50`	`if (options.nameOnly) {`
`52`	`51`	`if (contents.match(regex)) {`
`53`	`52`	`grep.push(file);`
`54`	`53`	`}`
`55`	`54`	`} else {`
	`55`	`+ var lines = contents.split('\n');`
`56`	`56`	`lines.forEach(function (line) {`
`57`	`57`	`var matched = line.match(regex);`
`58`	`58`	`if ((options.inverse && !matched) \|\| (!options.inverse && matched)) {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ function _sed(options, regex, replacement, files) {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`var contents = file === '-' ? pipe : fs.readFileSync(file, 'utf8');`
`72`		`- var lines = contents.split(/\r*\n/);`
	`72`	`+ var lines = contents.split('\n');`
`73`	`73`	`var result = lines.map(function (line) {`
`74`	`74`	`return line.replace(regex, replacement);`
`75`	`75`	`}).join('\n');`