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

rc-status: convert snprintf calls to xasprintf

Browse Source
This commit is contained in:
William Hubbs 2018-06-19 17:06:33 -05:00
parent a616516895
commit be7ad06d4a
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/rc/rc-status.c
View File

@ -126,7 +126,7 @@ static char *get_uptime(const char *service)
static void static void
print_service(const char *service) print_service(const char *service)
{ {
char status[60]; char *status = NULL;
char *uptime = NULL; char *uptime = NULL;
char *child_pid = NULL; char *child_pid = NULL;
char *start_time = NULL; char *start_time = NULL;
@ -136,12 +136,12 @@ print_service(const char *service)
ECOLOR color = ECOLOR_BAD; ECOLOR color = ECOLOR_BAD;
if (state & RC_SERVICE_STOPPING) if (state & RC_SERVICE_STOPPING)
snprintf(status, sizeof(status), "stopping "); xasprintf(&status, "stopping ");
else if (state & RC_SERVICE_STARTING) { else if (state & RC_SERVICE_STARTING) {
snprintf(status, sizeof(status), "starting "); xasprintf(&status, "starting ");
color = ECOLOR_WARN; color = ECOLOR_WARN;
} else if (state & RC_SERVICE_INACTIVE) { } else if (state & RC_SERVICE_INACTIVE) {
snprintf(status, sizeof(status), "inactive "); xasprintf(&status, "inactive ");
color = ECOLOR_WARN; color = ECOLOR_WARN;
} else if (state & RC_SERVICE_STARTED) { } else if (state & RC_SERVICE_STARTED) {
errno = 0; errno = 0;
@ -150,30 +150,31 @@ print_service(const char *service)
child_pid = rc_service_value_get(service, "child_pid"); child_pid = rc_service_value_get(service, "child_pid");
start_time = rc_service_value_get(service, "start_time"); start_time = rc_service_value_get(service, "start_time");
if (start_time && child_pid) if (start_time && child_pid)
snprintf(status, sizeof(status), " unsupervised "); xasprintf(&status, " unsupervised ");
else else
snprintf(status, sizeof(status), " crashed "); xasprintf(&status, " crashed ");
free(child_pid); free(child_pid);
free(start_time); free(start_time);
} else { } else {
uptime = get_uptime(service); uptime = get_uptime(service);
if (uptime) { if (uptime) {
snprintf(status, sizeof(status), " started %s", uptime); xasprintf(&status, " started %s", uptime);
free(uptime); free(uptime);
} else } else
snprintf(status, sizeof(status), " started "); xasprintf(&status, " started ");
color = ECOLOR_GOOD; color = ECOLOR_GOOD;
} }
} else if (state & RC_SERVICE_SCHEDULED) { } else if (state & RC_SERVICE_SCHEDULED) {
snprintf(status, sizeof(status), "scheduled"); xasprintf(&status, "scheduled");
color = ECOLOR_WARN; color = ECOLOR_WARN;
} else } else
snprintf(status, sizeof(status), " stopped "); xasprintf(&status, " stopped ");
errno = 0; errno = 0;
if (c && *c && isatty(fileno(stdout))) if (c && *c && isatty(fileno(stdout)))
printf("\n"); printf("\n");
ebracket(cols, color, status); ebracket(cols, color, status);
free(status);
} }
static void static void