diff options
| author | Mohamed A. Khalfella <khalfella@gmail.com> | 2015-09-14 22:06:48 +0300 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2015-09-17 07:58:16 -0400 |
| commit | a725189c0accbf47b39f735d1f32a7b54ae91c6d (patch) | |
| tree | 19d37e51ab9f8b859745d9f09b1ca6df04ebe473 /usr | |
| parent | caf590b518921f14033a11d17fafa827bb2caa4b (diff) | |
| download | illumos-gate-a725189c0accbf47b39f735d1f32a7b54ae91c6d.tar.gz | |
5433 at(1) doesn't properly handle being invoked from a path containing spaces
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/cmd/cron/at.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/usr/src/cmd/cron/at.c b/usr/src/cmd/cron/at.c index 37fe880ee2..68769c2f8a 100644 --- a/usr/src/cmd/cron/at.c +++ b/usr/src/cmd/cron/at.c @@ -101,6 +101,7 @@ static int not_this_project(char *); static char *mkjobname(time_t); static time_t parse_time(char *); static time_t gtime(struct tm *); +static void escapestr(const char *); void atabort(char *)__NORETURN; void yyerror(void); extern int yyparse(void); @@ -546,6 +547,23 @@ struct tm *tptr; } /* + * Escape a string to be used inside the job shell script. + */ +static void +escapestr(const char *str) +{ + char c; + (void) putchar('\''); + while ((c = *str++) != '\0') { + if (c != '\'') + (void) putchar(c); + else + (void) fputs("'\\''", stdout); /* ' -> '\'' */ + } + (void) putchar('\''); +} + +/* * make job file from proto + stdin */ static void @@ -633,12 +651,12 @@ copy(char *jobfile, FILE *inputfile, int when) } for (ep = environ; *ep; ep++) { - if (strchr(*ep, '\'') != NULL) - continue; if ((val = strchr(*ep, '=')) == NULL) continue; *val++ = '\0'; - printf("export %s; %s='%s'\n", *ep, *ep, val); + (void) printf("export %s; %s=", *ep, *ep); + escapestr(val); + (void) putchar('\n'); *--val = '='; } if ((pfp = fopen(pname1, "r")) == NULL && @@ -678,7 +696,7 @@ copy(char *jobfile, FILE *inputfile, int when) if (seteuid(effeusr) < 0) { atabort(CANTCHUID); } - printf("%s", dirbuf); + escapestr(dirbuf); break; case 'm': printf("%o", um); |