damnit.

[oweals/busybox.git] / sed.c

diff --git a/sed.c b/sed.c
index a3e635d3a36990b1a53e2d5b691c5c5be4450341..4dfc0246c9e87a9b54033a587ad842dbb99ea8b9 100644 (file)
--- a/sed.c
+++ b/sed.c
@@ -32,22 +32,36 @@
 #include <ctype.h>
 
 static const char sed_usage[] = 
-"sed [-n] [-e script] [file...]\n"
-"Allowed scripts come in the following form:\n\n"
-"'s/regexp/replacement/[gp]'\n"
-"\tattempt to match regexp against the pattern space\n"
-"\tand if successful replaces the matched portion with replacement.\n\n"
+"sed [-n] [-e script] [file...]\n\n"
+"Allowed sed scripts come in the following form:\n"
+"\t's/regexp/replacement/[gp]'\n"
+"which attempt to match regexp against the pattern space\n"
+"and if successful replaces the matched portion with replacement.\n\n"
 "Options:\n"
 "-e\tadd the script to the commands to be executed\n"
 "-n\tsuppress automatic printing of pattern space\n\n"
 #if defined BB_REGEXP
-"This version of sed matches full regexps.\n";
+"This version of sed matches full regular expresions.\n";
 #else
-"This version of sed matches strings (not full regexps).\n";
+"This version of sed matches strings (not full regular expresions).\n";
 #endif
+    
 
+static void do_sed(FILE *fp, char *needle, char *newNeedle, int ignoreCase, int printFlag, int quietFlag)
+{
+    int foundOne=FALSE;
+    char haystack[1024];
 
-
+    while (fgets (haystack, 1023, fp)) {
+       foundOne = replace_match(haystack, needle, newNeedle, ignoreCase);
+       if (foundOne==TRUE && printFlag==TRUE) {
+           fprintf(stdout, haystack);
+       }
+       if (quietFlag==FALSE) {
+           fprintf(stdout, haystack);
+       }
+    }
+}
 
 extern int sed_main (int argc, char **argv)
 {
@@ -56,10 +70,9 @@ extern int sed_main (int argc, char **argv)
     char *name;
     char *cp;
     int ignoreCase=FALSE;
-    int foundOne=FALSE;
-    int noprintFlag=FALSE;
+    int printFlag=FALSE;
+    int quietFlag=FALSE;
     int stopNow;
-    char *haystack;
 
     argc--;
     argv++;
@@ -72,24 +85,23 @@ extern int sed_main (int argc, char **argv)
        cp = *argv++;
        stopNow=FALSE;
 
-       while (*++cp && stopNow==FALSE)
+       while (*++cp && stopNow==FALSE) {
            switch (*cp) {
            case 'n':
-               noprintFlag = TRUE;
+               quietFlag = TRUE;
                break;
            case 'e':
                if (*(cp+1)==0 && --argc < 0) {
-                   fprintf(stderr, "A\n");
                    usage( sed_usage);
                }
-               cp = *argv++;
+               if ( *++cp != 's')
+                   cp = *argv++;
                while( *cp ) {
                    if (*cp == 's' && strlen(cp) > 3 && *(cp+1) == '/') {
                        char* pos=needle=cp+2;
                        for(;;) {
                            pos = strchr(pos, '/');
                            if (pos==NULL) {
-                               fprintf(stderr, "B\n");
                                usage( sed_usage);
                            }
                            if (*(pos-1) == '\\') {
@@ -103,7 +115,6 @@ extern int sed_main (int argc, char **argv)
                        for(;;) {
                            pos = strchr(pos, '/');
                            if (pos==NULL) {
-                               fprintf(stderr, "C\n");
                                usage( sed_usage);
                            }
                            if (*(pos-1) == '\\') {
@@ -113,47 +124,54 @@ extern int sed_main (int argc, char **argv)
                            break;
                        }
                        *pos=0;
+                       if (pos+2 != 0) {
+                           while (*++pos) {
+                               switch (*pos) {
+                                   case 'i':
+                                       ignoreCase=TRUE;
+                                       break;
+                                   case 'p':
+                                       printFlag=TRUE;
+                                       break;
+                                   case 'g':
+                                       break;
+                                   default:
+                                       usage( sed_usage);
+                               }
+                           }
+                       }
                    }
                    cp++;
                }
-               fprintf(stderr, "replace '%s' with '%s'\n", needle, newNeedle);
+               //fprintf(stderr, "replace '%s' with '%s'\n", needle, newNeedle);
                stopNow=TRUE;
                break;
 
            default:
-               fprintf(stderr, "D\n");
                usage(sed_usage);
            }
+       }
     }
 
-    fprintf(stderr, "argc=%d\n", argc);
-    while (argc-- > 0) {
-       name = *argv++;
+    if (argc==0) {
+       do_sed( stdin, needle, newNeedle, ignoreCase, printFlag, quietFlag);
+    } else {
+       while (argc-- > 0) {
+           name = *argv++;
 
-       fp = fopen (name, "r");
-       if (fp == NULL) {
-           perror (name);
-           continue;
-       }
-       fprintf(stderr, "filename is '%s'\n", name);
-
-       haystack = (char*)malloc( 80);
-       while (fgets (haystack, sizeof (haystack), fp)) {
-
-           foundOne = replace_match(haystack, needle, newNeedle, ignoreCase);
-           if (noprintFlag==TRUE && foundOne==TRUE)
-               fputs (haystack, stdout);
-           else
-               fputs (haystack, stdout);
-           /* Avoid any mem leaks */
-           free(haystack);
-           haystack = (char*)malloc( BUF_SIZE);
-       }
+           fp = fopen (name, "r");
+           if (fp == NULL) {
+               perror (name);
+               continue;
+           }
 
-       if (ferror (fp))
-           perror (name);
+           do_sed( fp, needle, newNeedle, ignoreCase, printFlag, quietFlag);
 
-       fclose (fp);
+           if (ferror (fp))
+               perror (name);
+
+           fclose (fp);
+       }
     }
     exit( TRUE);
 }