Major coreutils update.

5 files changed, 22 insertions, 22 deletions

diff --git a/procps/free.c b/procps/free.c
index 4a5469b10..2f520e418 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -63,7 +63,7 @@ extern int free_main(int argc, char **argv)
         }
 
         if (argc > 1 && **(argv + 1) == '-')
-                show_usage();
+                bb_show_usage();
 
         printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free", 
                         "shared", "buffers");
diff --git a/procps/kill.c b/procps/kill.c
index c7a3c7f72..3d6fe80cb 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -44,7 +44,7 @@ extern int kill_main(int argc, char **argv)
 
 #ifdef CONFIG_KILLALL
         /* Figure out what we are trying to do here */
-        whichApp = (strcmp(applet_name, "killall") == 0)? KILLALL : KILL; 
+        whichApp = (strcmp(bb_applet_name, "killall") == 0)? KILLALL : KILL; 
 #else
         whichApp = KILL;
 #endif
@@ -54,7 +54,7 @@ extern int kill_main(int argc, char **argv)
         argv++;
         /* Parse any options */
         if (argc < 1)
-                show_usage();
+                bb_show_usage();
 
         while (argc > 0 && **argv == '-') {
                 while (*++(*argv)) {
@@ -87,11 +87,11 @@ extern int kill_main(int argc, char **argv)
                                         }
                                         return EXIT_SUCCESS;
                                 case '-':
-                                        show_usage();
+                                        bb_show_usage();
                                 default:
                                         name = u_signal_names(*argv, &sig, 0);
                                         if(name==NULL)
-                                                error_msg_and_die( "bad signal name: %s", *argv);
+                                                bb_error_msg_and_die( "bad signal name: %s", *argv);
                                         argc--;
                                         argv++;
                                         goto do_it_now;
@@ -109,10 +109,10 @@ do_it_now:
                         int pid;
 
                         if (!isdigit(**argv))
-                                perror_msg_and_die( "Bad PID");
+                                bb_perror_msg_and_die( "Bad PID");
                         pid = strtol(*argv, NULL, 0);
                         if (kill(pid, sig) != 0) {
-                                perror_msg( "Could not kill pid '%d'", pid);
+                                bb_perror_msg( "Could not kill pid '%d'", pid);
                                 errors++;
                         }
                         argv++;
@@ -130,7 +130,7 @@ do_it_now:
                         if (*pidList <= 0) {
                                 errors++;
                                 if (quiet==0)
-                                        error_msg( "%s: no process killed", *argv);
+                                        bb_error_msg( "%s: no process killed", *argv);
                                 } else {
                                         long *pl;
 
@@ -140,7 +140,7 @@ do_it_now:
                                                 if (kill(*pl, sig) != 0) {
                                                         errors++;
                                                         if (quiet==0)
-                                                                perror_msg( "Could not kill pid '%ld'", *pl);
+                                                                bb_perror_msg( "Could not kill pid '%ld'", *pl);
                                                 }
                                         }
                         }
diff --git a/procps/pidof.c b/procps/pidof.c
index 8cd1a91c8..d77f7f02b 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -46,7 +46,7 @@ extern int pidof_main(int argc, char **argv)
                                 single_flag = 1;
                                 break;
                         default:
-                                show_usage();
+                                bb_show_usage();
                 }
         }
 
diff --git a/procps/renice.c b/procps/renice.c
index ec35bdcde..a81156eea 100644
--- a/procps/renice.c
+++ b/procps/renice.c
@@ -32,7 +32,7 @@ extern int renice_main(int argc, char **argv)
 {
         int prio, status = EXIT_SUCCESS;
         
-        if (argc < 3)   show_usage();
+        if (argc < 3)   bb_show_usage();
                 
         prio = atoi(*++argv);
         if (prio > 20)          prio = 20;
@@ -45,7 +45,7 @@ extern int renice_main(int argc, char **argv)
                 if (setpriority(PRIO_PROCESS, ps, prio) == 0) {
                         printf("%d: old priority %d, new priority %d\n", ps, oldp, prio );
                 } else {
-                        perror_msg("%d: setpriority", ps);
+                        bb_perror_msg("%d: setpriority", ps);
                         status = EXIT_FAILURE;
                 }
         }
diff --git a/procps/top.c b/procps/top.c
index 4204deaf2..b70a42a72 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -155,11 +155,11 @@ static unsigned long Hertz;
 
 #define FILE_TO_BUF(filename, fd) do{                           \
     if (fd == -1 && (fd = open(filename, O_RDONLY)) == -1) {    \
-        perror_msg_and_die("/proc not be mounted?");            \
+        bb_perror_msg_and_die("/proc not be mounted?");            \
     }                                                           \
     lseek(fd, 0L, SEEK_SET);                                    \
     if ((local_n = read(fd, buf, sizeof buf - 1)) < 0) {        \
-        perror_msg_and_die("%s", filename);                     \
+        bb_perror_msg_and_die("%s", filename);                     \
     }                                                           \
     buf[local_n] = '\0';                                        \
 }while(0)
@@ -167,7 +167,7 @@ static unsigned long Hertz;
 #define FILE_TO_BUF2(filename, fd) do{                          \
     lseek(fd, 0L, SEEK_SET);                                    \
     if ((local_n = read(fd, buf, sizeof buf - 1)) < 0) {        \
-        perror_msg_and_die("%s", filename);                     \
+        bb_perror_msg_and_die("%s", filename);                     \
     }                                                           \
     buf[local_n] = '\0';                                        \
 }while(0)
@@ -313,19 +313,19 @@ static unsigned long display_generic(void)
         unsigned long total, used, mfree, shared, buffers, cached;
 
         /* read memory info */
-        fp = xfopen("meminfo", "r");
+        fp = bb_xfopen("meminfo", "r");
         fgets(buf, sizeof(buf), fp);    /* skip first line */
 
         if (fscanf(fp, "Mem: %lu %lu %lu %lu %lu %lu",
                    &total, &used, &mfree, &shared, &buffers, &cached) != 6) {
-                error_msg_and_die("failed to read '%s'", "meminfo");
+                bb_error_msg_and_die("failed to read '%s'", "meminfo");
         }
         fclose(fp);
         
         /* read load average */
-        fp = xfopen("loadavg", "r");
+        fp = bb_xfopen("loadavg", "r");
         if (fscanf(fp, "%f %f %f", &avg1, &avg2, &avg3) != 3) {
-                error_msg_and_die("failed to read '%s'", "loadavg");
+                bb_error_msg_and_die("failed to read '%s'", "loadavg");
         }
         fclose(fp);
 
@@ -447,7 +447,7 @@ int top_main(int argc, char **argv)
                     interval = atoi(optarg);
                     break;
                 default:
-                    show_usage();
+                    bb_show_usage();
             }
         }
 
@@ -461,7 +461,7 @@ int top_main(int argc, char **argv)
 #endif
         /* change to /proc */
         if (chdir("/proc") < 0) {
-                perror_msg_and_die("chdir('/proc')");
+                bb_perror_msg_and_die("chdir('/proc')");
         }
 #if defined CONFIG_FEATURE_USE_TERMIOS
         tcgetattr(0, (void *) &initial_settings);
@@ -508,7 +508,7 @@ int top_main(int argc, char **argv)
                         memcpy(top + n, p, sizeof(procps_status_t));
                 }
                 if (ntop == 0) {
-                perror_msg_and_die("scandir('/proc')");
+                bb_perror_msg_and_die("scandir('/proc')");
         }
 #ifdef FEATURE_CPU_USAGE_PERCENTAGE
                 if(!Hertz) {