Changeset 1301 in kBuild for trunk/src

Timestamp:

Dec 1, 2007 10:35:55 PM (17 years ago)

Author:

bird

Message:

Added options for sending the output to a file without having to make use of redirection (-o, --output, --output-text, --output-binary).

Location:

trunk/src/sed/sed

Files:

• compile.c (modified) (1 diff)
• execute.c (modified) (2 diffs)
• sed.c (modified) (6 diffs)
• sed.h (modified) (1 diff)

trunk/src/sed/sed/compile.c

@@ -405 +405 @@
       /* std* sometimes are not constants, so they
          cannot be used in the initializer for special_files */
+#ifndef CONFIG_WITHOUT_O_OPT
+      my_stdin = stdin; my_stdout = sed_stdout; my_stderr = stderr;
+#else
       my_stdin = stdin; my_stdout = stdout; my_stderr = stderr;
+#endif
       for (special = special_files; special->outf.name; special++)
         if (strcmp(special->outf.name, file_name) == 0)

trunk/src/sed/sed/execute.c

@@ -504 +504 @@
   FILE *fp;
 {
+#ifndef CONFIG_WITHOUT_O_OPT
+  if (fp != sed_stdout || unbuffered_output)
+#else
   if (fp != stdout || unbuffered_output)
+#endif
     ck_fflush(fp);
 }
@@ -699 +703 @@
     }
   else
+#ifndef CONFIG_WITHOUT_O_OPT
+    output_file.fp = sed_stdout;
+#else
     output_file.fp = stdout;
+#endif
 }
 

trunk/src/sed/sed/sed.c

@@ -61 +61 @@
 
 int extended_regexp_flags = 0;
+
+#ifndef CONFIG_WITHOUT_O_OPT
+/* The output file, defaults to stdout but can be overridden
+   by the -o or --output option. main sets this to avoid problems. */
+FILE *sed_stdout = NULL;
+#endif
 
 /* If set, fflush(stdout) on every line output. */
@@ -112 +118 @@
   fprintf(out, _("  --posix\n\
                  disable all GNU extensions.\n"));
+#ifndef CONFIG_WITHOUT_O_OPT
+  fprintf(out, _("  -o, --output=file, --output-text=file, --output-binary=file\n\
+                 use the specified file instead of stdout; the first two uses\n\
+                 uses the default text/binary mode.\n"));
+#endif
   fprintf(out, _("  -r, --regexp-extended\n\
                  use extended regular expressions in the script.\n"));
@@ -143 +154 @@
 {
 #ifdef REG_PERL
+# ifndef CONFIG_WITHOUT_O_OPT
+#define SHORTOPTS "snrRue:f:l:i::o:V:"
+# else
 #define SHORTOPTS "snrRue:f:l:i::V:"
-#else
+# endif
+#else
+# ifndef CONFIG_WITHOUT_O_OPT
+#define SHORTOPTS "snrue:f:l:i::o:V:"
+# else
 #define SHORTOPTS "snrue:f:l:i::V:"
+# endif
 #endif
 
@@ -162 +181 @@
     {"separate", 0, NULL, 's'},
     {"unbuffered", 0, NULL, 'u'},
+#ifndef CONFIG_WITHOUT_O_OPT
+    {"output", 1, NULL, 'o'},
+    {"output-binary", 1, NULL, 300},
+    {"output-text", 1, NULL, 301},
+#endif
     {"version", 0, NULL, 'v'},
     {"help", 0, NULL, 'h'},
@@ -172 +196 @@
 
   initialize_main (&argc, &argv);
+#ifndef CONFIG_WITHOUT_O_OPT
+  sed_stdout = stdout;
+#endif
 #if HAVE_SETLOCALE
   /* Set locale according to user's wishes.  */
@@ -259 +286 @@
           break;
 
+#ifndef CONFIG_WITHOUT_O_OPT
+        case 'o':
+          sed_stdout = ck_fopen (optarg, "w", true /* fail on error */);
+          break;
+
+        case 300:
+          sed_stdout = ck_fopen (optarg, "wb", true /* fail on error */);
+          break;
+
+        case 301:
+          sed_stdout = ck_fopen (optarg, "wt", true /* fail on error */);
+          break;
+#endif
+
         case 'p':
           posixicity = POSIXLY_BASIC;

trunk/src/sed/sed/sed.h

@@ -212 +212 @@
 extern int extended_regexp_flags;
 
+#ifndef CONFIG_WITHOUT_O_OPT
+/* The output file, defaults to stdout but can be overridden
+   by the -o or --output option. main sets this to avoid problems. */
+extern FILE *sed_stdout;
+#endif
+
 /* If set, fflush(stdout) on every line output. */
 extern bool unbuffered_output;