diff options
| author | Roy Marples <roy@marples.name> | 2007-10-23 20:43:45 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-10-23 20:43:45 +0000 |
| commit | 0764a6cb460b5bc63f7037988013d86208fca6b4 (patch) | |
| tree | 84592a5859119d98f1d44c1f1b687ac2b7fa6312 /src/librc.c | |
| parent | bf0cc2dac43bde5249ad2a918006e560382f86d0 (diff) | |
| download | openrc-0764a6cb460b5bc63f7037988013d86208fca6b4.tar.gz openrc-0764a6cb460b5bc63f7037988013d86208fca6b4.tar.bz2 openrc-0764a6cb460b5bc63f7037988013d86208fca6b4.tar.xz | |
Stop using asprintf
Diffstat (limited to 'src/librc.c')
| -rw-r--r-- | src/librc.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/librc.c b/src/librc.c index e270bbe..8557ba1 100644 --- a/src/librc.c +++ b/src/librc.c @@ -271,6 +271,7 @@ bool rc_service_exists (const char *service) } librc_hidden_def(rc_service_exists) +#define OPTSTR ". '%s'; echo \"${opts}\"" char **rc_service_options (const char *service) { char *svc; @@ -280,11 +281,14 @@ char **rc_service_options (const char *service) char *token; char *p = buffer; FILE *fp; + int l; if (! (svc = rc_service_resolve (service))) return (NULL); - asprintf (&cmd, ". '%s'; echo \"${opts}\"", svc); + l = strlen (OPTSTR) + strlen (svc) + 1; + cmd = xmalloc (sizeof (char) * l); + snprintf (cmd, l, OPTSTR, svc); free (svc); if ((fp = popen (cmd, "r"))) { buffer = xmalloc (sizeof (char) * RC_LINEBUFFER); @@ -297,10 +301,12 @@ char **rc_service_options (const char *service) pclose (fp); free (buffer); } + free (cmd); return (opts); } librc_hidden_def(rc_service_options) +#define DESCSTR ". '%s'; echo \"${description%s%s}\"" char *rc_service_description (const char *service, const char *option) { char *svc; @@ -309,6 +315,7 @@ char *rc_service_description (const char *service, const char *option) char *desc = NULL; FILE *fp; int i; + int l; if (! (svc = rc_service_resolve (service))) return (NULL); @@ -316,8 +323,9 @@ char *rc_service_description (const char *service, const char *option) if (! option) option = ""; - asprintf (&cmd, ". '%s'; echo \"${description%s%s}\"", - svc, option ? "_" : "", option); + l = strlen (DESCSTR) + strlen (svc) + strlen (option) + 2; + cmd = xmalloc (sizeof (char) * l); + snprintf (cmd, l, DESCSTR, svc, option ? "_" : "", option); free (svc); if ((fp = popen (cmd, "r"))) { buffer = xmalloc (sizeof (char) * RC_LINEBUFFER); @@ -335,6 +343,7 @@ char *rc_service_description (const char *service, const char *option) free (buffer); pclose (fp); } + free (cmd); return (desc); } librc_hidden_def(rc_service_description) |