last_patch57 from Vladimir N. Oleynik
This commit is contained in:
parent
5a7ec22c49
commit
907a240b1c
@ -105,8 +105,8 @@ extern int logger_main(int argc, char **argv)
|
|||||||
{
|
{
|
||||||
int pri = LOG_USER | LOG_NOTICE;
|
int pri = LOG_USER | LOG_NOTICE;
|
||||||
int option = 0;
|
int option = 0;
|
||||||
int c, i, len, opt;
|
int c, i, opt;
|
||||||
char *message=NULL, buf[1024], name[128];
|
char buf[1024], name[128];
|
||||||
|
|
||||||
/* Fill out the name string early (may be overwritten later) */
|
/* Fill out the name string early (may be overwritten later) */
|
||||||
my_getpwuid(name, geteuid());
|
my_getpwuid(name, geteuid());
|
||||||
@ -143,16 +143,21 @@ extern int logger_main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
} while (c != EOF);
|
} while (c != EOF);
|
||||||
} else {
|
} else {
|
||||||
len = 1; /* for the '\0' */
|
char *message = NULL;
|
||||||
message = xcalloc(1, 1);
|
int len = argc - optind; /* for the space between the args
|
||||||
for (i = optind; i < argc; i++) {
|
and '\0' */
|
||||||
len += strlen(argv[i]);
|
opt = len;
|
||||||
len += 1; /* for the space between the args */
|
argv += optind;
|
||||||
|
for (i = 0; i < opt; i++) {
|
||||||
|
len += strlen(*argv);
|
||||||
message = xrealloc(message, len);
|
message = xrealloc(message, len);
|
||||||
strcat(message, argv[i]);
|
if(!i)
|
||||||
|
message[0] = 0;
|
||||||
|
else
|
||||||
strcat(message, " ");
|
strcat(message, " ");
|
||||||
|
strcat(message, *argv);
|
||||||
|
argv++;
|
||||||
}
|
}
|
||||||
message[strlen(message) - 2] = '\0';
|
|
||||||
syslog(pri, "%s", message);
|
syslog(pri, "%s", message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user