Improved port of ifconfig... smaller and with more features.

[oweals/busybox.git] / sed.c

diff --git a/sed.c b/sed.c
index e0351c3b80f6ae3029b68a4450467728a26dbc4d..0f0f4a28d19829907293ab7335e1fe544aee2ad8 100644 (file)
--- a/sed.c
+++ b/sed.c
@@ -436,8 +436,7 @@ static void load_cmd_file(char *filename)
                }
                /* eat trailing newline (if any) --if I don't do this, edit commands
                 * (aic) will print an extra newline */
-               if (line[strlen(line)-1] == '\n')
-                       line[strlen(line)-1] = 0;
+               chomp(line);
                add_cmd_str(line);
                free(line);
        }
@@ -671,11 +670,8 @@ extern int sed_main(int argc, char **argv)
 #endif
 
        /* do normal option parsing */
-       while ((opt = getopt(argc, argv, "hne:f:")) > 0) {
+       while ((opt = getopt(argc, argv, "ne:f:")) > 0) {
                switch (opt) {
-                       case 'h':
-                               usage(sed_usage);
-                               break;
                        case 'n':
                                be_quiet++;
                                break;
@@ -685,6 +681,8 @@ extern int sed_main(int argc, char **argv)
                        case 'f': 
                                load_cmd_file(optarg);
                                break;
+                       default:
+                               show_usage();
                }
        }
 
@@ -692,7 +690,7 @@ extern int sed_main(int argc, char **argv)
         * argv[optind] should be the pattern. no pattern, no worky */
        if (ncmds == 0) {
                if (argv[optind] == NULL)
-                       usage(sed_usage);
+                       show_usage();
                else {
                        add_cmd_str(argv[optind]);
                        optind++;