clean up code

This commit is contained in:
albert 2002-10-21 23:12:51 +00:00
parent 815604d57e
commit 7885375300

12
watch.c
View File

@ -44,7 +44,6 @@ static int first_screen=1;
#define min(x,y) ((x) > (y) ? (y) : (x)) #define min(x,y) ((x) > (y) ? (y) : (x))
#define max(x,y) ((x) > (y) ? (x) : (y))
static void static void
@ -105,8 +104,6 @@ main(int argc, char *argv[])
int interval=2; int interval=2;
char *command; char *command;
int command_length=0; /* not including final \0 */ int command_length=0; /* not including final \0 */
int s;
char *endp;
setlocale(LC_ALL,""); setlocale(LC_ALL,"");
progname = argv[0]; progname = argv[0];
@ -162,13 +159,12 @@ main(int argc, char *argv[])
if (optind >= argc) if (optind >= argc)
do_usage(); do_usage();
command_length = strlen(argv[optind]); command = strdup(argv[optind++]);
command = (char*)malloc(command_length + 1); /* space or \0 */ command_length = strlen(command);
memcpy(command, argv[optind++], command_length);
command[command_length] = '\0';
for (;optind<argc;optind++) for (;optind<argc;optind++)
{ {
s = strlen(argv[optind]); char *endp;
int s = strlen(argv[optind]);
command = realloc(command, command_length+s+2); /* space and \0 */ command = realloc(command, command_length+s+2); /* space and \0 */
endp = command + command_length; endp = command + command_length;
*endp = ' '; *endp = ' ';