start-stop-deamon is done

[oweals/busybox.git] / findutils / xargs.c

diff --git a/findutils/xargs.c b/findutils/xargs.c
index 1473f445fb4294c4091e6362693998e94cfe5c8d..5d64d0c9f742147dca842adc5e889a5f08f6c01b 100644 (file)
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -1,9 +1,9 @@
 /*
  * Mini xargs implementation for busybox
  *
- * Copyright (C) 2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
- * Remixed by Mark Whitley <markw@lineo.com>, <markw@codepoet.org>
+ * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
+ * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+ * Remixed by Mark Whitley <markw@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,10 +21,10 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "busybox.h"
 
 int xargs_main(int argc, char **argv)
 {
@@ -45,7 +45,7 @@ int xargs_main(int argc, char **argv)
        /* Store the command to be executed (taken from the command line) */
        if (argc == 1) {
                /* default behavior is to echo all the filenames */
-               cmd_to_be_executed = strdup("/bin/echo ");
+               cmd_to_be_executed = xstrdup("/bin/echo ");
        } else {
                /* concatenate all the arguments passed to xargs together */
                int i;
@@ -68,8 +68,7 @@ int xargs_main(int argc, char **argv)
                char *execstr = NULL;
 
                /* eat the newline off the filename. */
-               if (file_to_act_on[strlen(file_to_act_on)-1] == '\n')
-                       file_to_act_on[strlen(file_to_act_on)-1] = '\0';
+               chomp(file_to_act_on);
 
                /* eat blank lines */
                if (strlen(file_to_act_on) == 0)
@@ -96,7 +95,7 @@ int xargs_main(int argc, char **argv)
                free(file_to_act_on);
        }
 
-#ifdef BB_FEATURE_CLEAN_UP
+#ifdef CONFIG_FEATURE_CLEAN_UP
        free(cmd_to_be_executed);
 #endif