emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use strings directly in calls to usage(). This is in preparation

Browse Source 
for their extraction to a separate file.
This commit is contained in:
Matt Kraai
2000-07-14 23:28:47 +00:00
parent 464c5de00d
commit 3bd8bd89ee
31 changed files with 325 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
procps/free.c
View File

@@ -25,6 +25,12 @@
#include <stdio.h>
#include <errno.h>
const char free_usage[] =
"free\n"
#ifndef BB_FEATURE_TRIVIAL_HELP
"\nDisplays the amount of free and used system memory\n"
#endif
;
extern int free_main(int argc, char **argv)
{
@@ -53,14 +59,8 @@ extern int free_main(int argc, char **argv)
info.sharedram*=info.mem_unit;
info.bufferram*=info.mem_unit;
}
if (argc > 1 && **(argv + 1) == '-') {
usage("free\n"
#ifndef BB_FEATURE_TRIVIAL_HELP
"\nDisplays the amount of free and used system memory\n"
#endif
);
}
if (argc > 1 && **(argv + 1) == '-')
usage(free_usage);
printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free",
"shared", "buffers");

19
procps/ps.c
View File

@@ -114,6 +114,13 @@ static void parse_proc_status(char *S, proc_t * P)
}
const char ps_usage[] =
"ps\n"
#ifndef BB_FEATURE_TRIVIAL_HELP
"\nReport process status\n"
"\nThis version of ps accepts no options.\n"
#endif
;
extern int ps_main(int argc, char **argv)
{
@@ -134,14 +141,8 @@ extern int ps_main(int argc, char **argv)
if (argc > 1 && strcmp(argv[1], dash_dash_help) == 0) {
usage ("ps\n"
#ifndef BB_FEATURE_TRIVIAL_HELP
"\nReport process status\n"
"\nThis version of ps accepts no options.\n"
#endif
);
}
if (argc > 1 && strcmp(argv[1], dash_dash_help) == 0)
usage(ps_usage);
dir = opendir("/proc");
if (!dir)
@@ -223,7 +224,7 @@ extern int ps_main(int argc, char **argv)
#endif
if (argc > 1 && **(argv + 1) == '-')
usage("ps-devps\n\nReport process status\n\nThis version of ps accepts no options.\n\n");
usage(ps_usage);
/* open device */
fd = open(device, O_RDONLY);