Mercurial > hg > toybox
annotate lib/xwrap.c @ 1613:96aa7ec74936 draft
Fix yet another sed bug.
The s/// command would copy the \ of substitutions before deciding what to
do with them (generally overwriting the \ with the new data). When the
substitution was A) at the very end of the new string, B) resolved to nothing,
it could leave a trailing \ that didn't belong there and didn't get overwritten
because the "copy trailing data" part that copies the original string's null
terminator already happened before the \ overwrote it.
The ghostwheel() function restarts regexes after embedded NUL bytes, but
if the string it's passed is _longer_ than the length it's told then it
gets confused (and it means we're off the end of our allocation so segfaults
are likely).
Fix: test for \ first and move the "copy byte" logic into an else case.
| author | Rob Landley <rob@landley.net> |
|---|---|
| date | Mon, 15 Dec 2014 03:34:55 -0600 |
| parents | ce22ad7a26c1 |
| children | 492bd41f8b9a |
| rev | line source |
|---|---|
| 951 | 1 /* xwrap.c - wrappers around existing library functions. |
| 2 * | |
| 3 * Functions with the x prefix are wrappers that either succeed or kill the | |
| 4 * program with an error message, but never return failure. They usually have | |
| 5 * the same arguments and return value as the function they wrap. | |
| 6 * | |
| 7 * Copyright 2006 Rob Landley <rob@landley.net> | |
| 8 */ | |
| 9 | |
| 10 #include "toys.h" | |
| 11 | |
|
1599
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
12 // strcpy and strncat with size checking. Size is the total space in "dest", |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
13 // including null terminator. Exit if there's not enough space for the string |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
14 // (including space for the null terminator), because silently truncating is |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
15 // still broken behavior. (And leaving the string unterminated is INSANE.) |
| 951 | 16 void xstrncpy(char *dest, char *src, size_t size) |
| 17 { | |
|
1105
1bca28705a87
Give xstrncpy() a more informative error message.
Rob Landley <rob@landley.net>
parents:
1053
diff
changeset
|
18 if (strlen(src)+1 > size) error_exit("'%s' > %ld bytes", src, (long)size); |
| 951 | 19 strcpy(dest, src); |
| 20 } | |
| 21 | |
|
1599
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
22 void xstrncat(char *dest, char *src, size_t size) |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
23 { |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
24 long len = strlen(src); |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
25 |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
26 if (len+strlen(dest)+1 > size) |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
27 error_exit("'%s%s' > %ld bytes", src, (long)size); |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
28 strcpy(dest+len, src); |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
29 } |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
30 |
| 951 | 31 void xexit(void) |
| 32 { | |
| 33 if (toys.rebound) longjmp(*toys.rebound, 1); | |
| 34 else exit(toys.exitval); | |
| 35 } | |
| 36 | |
| 37 // Die unless we can allocate memory. | |
| 38 void *xmalloc(size_t size) | |
| 39 { | |
| 40 void *ret = malloc(size); | |
| 41 if (!ret) error_exit("xmalloc"); | |
| 42 | |
| 43 return ret; | |
| 44 } | |
| 45 | |
| 46 // Die unless we can allocate prezeroed memory. | |
| 47 void *xzalloc(size_t size) | |
| 48 { | |
| 49 void *ret = xmalloc(size); | |
| 50 memset(ret, 0, size); | |
| 51 return ret; | |
| 52 } | |
| 53 | |
| 54 // Die unless we can change the size of an existing allocation, possibly | |
| 55 // moving it. (Notice different arguments from libc function.) | |
| 56 void *xrealloc(void *ptr, size_t size) | |
| 57 { | |
| 58 ptr = realloc(ptr, size); | |
| 59 if (!ptr) error_exit("xrealloc"); | |
| 60 | |
| 61 return ptr; | |
| 62 } | |
| 63 | |
| 64 // Die unless we can allocate a copy of this many bytes of string. | |
| 65 char *xstrndup(char *s, size_t n) | |
| 66 { | |
|
1599
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
67 char *ret = strndup(s, ++n); |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
68 |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
69 if (!ret) error_exit("xstrndup"); |
|
cd97856ca52c
Implement xstrncat() and fix xstrndup().
Rob Landley <rob@landley.net>
parents:
1583
diff
changeset
|
70 ret[--n] = 0; |
| 951 | 71 |
| 72 return ret; | |
| 73 } | |
| 74 | |
| 75 // Die unless we can allocate a copy of this string. | |
| 76 char *xstrdup(char *s) | |
| 77 { | |
| 78 return xstrndup(s, strlen(s)); | |
| 79 } | |
| 80 | |
| 81 // Die unless we can allocate enough space to sprintf() into. | |
|
1183
0752b2d58909
Rename xmsprintf() to just xmprintf().
Rob Landley <rob@landley.net>
parents:
1170
diff
changeset
|
82 char *xmprintf(char *format, ...) |
| 951 | 83 { |
| 84 va_list va, va2; | |
| 85 int len; | |
| 86 char *ret; | |
| 87 | |
| 88 va_start(va, format); | |
| 89 va_copy(va2, va); | |
| 90 | |
| 91 // How long is it? | |
| 92 len = vsnprintf(0, 0, format, va); | |
| 93 len++; | |
| 94 va_end(va); | |
| 95 | |
| 96 // Allocate and do the sprintf() | |
| 97 ret = xmalloc(len); | |
| 98 vsnprintf(ret, len, format, va2); | |
| 99 va_end(va2); | |
| 100 | |
| 101 return ret; | |
| 102 } | |
| 103 | |
| 104 void xprintf(char *format, ...) | |
| 105 { | |
| 106 va_list va; | |
| 107 va_start(va, format); | |
| 108 | |
| 109 vprintf(format, va); | |
|
1529
e127aa575ff2
More static analysis fixes from Ashwini Sharma.
Rob Landley <rob@landley.net>
parents:
1528
diff
changeset
|
110 va_end(va); |
|
1318
955169e818d0
Isaac Dunham suggested xprintf() should call fflush() instead of ferror(), and posix-2008 doesn't say if fflush() covers ferror() (or can return success when the stream's error state is set), so call both.
Rob Landley <rob@landley.net>
parents:
1235
diff
changeset
|
111 if (fflush(stdout) || ferror(stdout)) perror_exit("write"); |
| 951 | 112 } |
| 113 | |
| 114 void xputs(char *s) | |
| 115 { | |
|
1318
955169e818d0
Isaac Dunham suggested xprintf() should call fflush() instead of ferror(), and posix-2008 doesn't say if fflush() covers ferror() (or can return success when the stream's error state is set), so call both.
Rob Landley <rob@landley.net>
parents:
1235
diff
changeset
|
116 if (EOF == puts(s) || fflush(stdout) || ferror(stdout)) perror_exit("write"); |
| 951 | 117 } |
| 118 | |
| 119 void xputc(char c) | |
| 120 { | |
|
1318
955169e818d0
Isaac Dunham suggested xprintf() should call fflush() instead of ferror(), and posix-2008 doesn't say if fflush() covers ferror() (or can return success when the stream's error state is set), so call both.
Rob Landley <rob@landley.net>
parents:
1235
diff
changeset
|
121 if (EOF == fputc(c, stdout) || fflush(stdout) || ferror(stdout)) |
|
955169e818d0
Isaac Dunham suggested xprintf() should call fflush() instead of ferror(), and posix-2008 doesn't say if fflush() covers ferror() (or can return success when the stream's error state is set), so call both.
Rob Landley <rob@landley.net>
parents:
1235
diff
changeset
|
122 perror_exit("write"); |
| 951 | 123 } |
| 124 | |
| 125 void xflush(void) | |
| 126 { | |
|
1318
955169e818d0
Isaac Dunham suggested xprintf() should call fflush() instead of ferror(), and posix-2008 doesn't say if fflush() covers ferror() (or can return success when the stream's error state is set), so call both.
Rob Landley <rob@landley.net>
parents:
1235
diff
changeset
|
127 if (fflush(stdout) || ferror(stdout)) perror_exit("write");; |
| 951 | 128 } |
| 129 | |
|
952
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
130 // Call xexec with a chunk of optargs, starting at skip. (You can't just |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
131 // call xexec() directly because toy_init() frees optargs.) |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
132 void xexec_optargs(int skip) |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
133 { |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
134 char **s = toys.optargs; |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
135 |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
136 toys.optargs = 0; |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
137 xexec(s+skip); |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
138 } |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
139 |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
140 |
| 951 | 141 // Die unless we can exec argv[] (or run builtin command). Note that anything |
| 142 // with a path isn't a builtin, so /bin/sh won't match the builtin sh. | |
| 143 void xexec(char **argv) | |
| 144 { | |
|
1528
ec07449e8e4a
Add TOYBOX_NORECURSE so xexec() won't make internal function calls.
Rob Landley <rob@landley.net>
parents:
1473
diff
changeset
|
145 if (CFG_TOYBOX && !CFG_TOYBOX_NORECURSE) toy_exec(argv); |
| 951 | 146 execvp(argv[0], argv); |
| 147 | |
| 148 perror_exit("exec %s", argv[0]); | |
| 149 } | |
| 150 | |
|
1334
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
151 // Spawn child process, capturing stdin/stdout. |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
152 // argv[]: command to exec. If null, child returns to original program. |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
153 // pipes[2]: stdin, stdout of new process. If -1 will not have pipe allocated. |
|
1334
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
154 // return: pid of child process |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
155 pid_t xpopen_both(char **argv, int *pipes) |
|
1334
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
156 { |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
157 int cestnepasun[4], pid; |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
158 |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
159 // Make the pipes? Not this won't set either pipe to 0 because if fds are |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
160 // allocated in order and if fd0 was free it would go to cestnepasun[0] |
|
1334
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
161 if (pipes) { |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
162 for (pid = 0; pid < 2; pid++) { |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
163 if (pipes[pid] == -1) continue; |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
164 if (pipe(cestnepasun+(2*pid))) perror_exit("pipe"); |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
165 pipes[pid] = cestnepasun[pid+1]; |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
166 } |
|
1334
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
167 } |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
168 |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
169 // Child process |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
170 if (!(pid = xfork())) { |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
171 // Dance of the stdin/stdout redirection. |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
172 if (pipes) { |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
173 // if we had no stdin/out, pipe handles could overlap, so test for it |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
174 // and free up potentially overlapping pipe handles before reuse |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
175 if (pipes[1] != -1) close(cestnepasun[2]); |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
176 if (pipes[0] != -1) { |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
177 close(cestnepasun[1]); |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
178 if (cestnepasun[0]) { |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
179 dup2(cestnepasun[0], 0); |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
180 close(cestnepasun[0]); |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
181 } |
|
1334
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
182 } |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
183 if (pipes[1] != -1) { |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
184 dup2(cestnepasun[3], 1); |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
185 dup2(cestnepasun[3], 2); |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
186 if (cestnepasun[3] > 2 || !cestnepasun[3]) close(cestnepasun[3]); |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
187 } |
|
1334
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
188 } |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
189 if (argv) { |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
190 if (CFG_TOYBOX) toy_exec(argv); |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
191 execvp(argv[0], argv); |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
192 _exit(127); |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
193 } |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
194 return 0; |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
195 |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
196 } |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
197 |
|
1334
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
198 // Parent process |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
199 if (pipes) { |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
200 if (pipes[0] != -1) close(cestnepasun[0]); |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
201 if (pipes[1] != -1) close(cestnepasun[3]); |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
202 } |
|
1334
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
203 |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
204 return pid; |
|
1334
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
205 } |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
206 |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
207 int xpclose_both(pid_t pid, int *pipes) |
|
1334
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
208 { |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
209 int rc = 127; |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
210 |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
211 if (pipes) { |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
212 close(pipes[0]); |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
213 close(pipes[1]); |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
214 } |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
215 waitpid(pid, &rc, 0); |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
216 |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
217 return WIFEXITED(rc) ? WEXITSTATUS(rc) : WTERMSIG(rc) + 127; |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
218 } |
|
9fd2bcedbeb5
mount: start on option parsing, implement loopback and bind mount autodetection.
Rob Landley <rob@landley.net>
parents:
1327
diff
changeset
|
219 |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
220 // Wrapper to xpopen with a pipe for just one of stdin/stdout |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
221 pid_t xpopen(char **argv, int *pipe, int stdout) |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
222 { |
|
1473
bff076394df5
Second attempt at one way xpopen().
Rob Landley <rob@landley.net>
parents:
1472
diff
changeset
|
223 int pipes[2], pid; |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
224 |
|
1473
bff076394df5
Second attempt at one way xpopen().
Rob Landley <rob@landley.net>
parents:
1472
diff
changeset
|
225 pipes[!stdout] = -1; |
|
bff076394df5
Second attempt at one way xpopen().
Rob Landley <rob@landley.net>
parents:
1472
diff
changeset
|
226 pipes[!!stdout] = 0; |
|
bff076394df5
Second attempt at one way xpopen().
Rob Landley <rob@landley.net>
parents:
1472
diff
changeset
|
227 pid = xpopen_both(argv, pipes); |
|
bff076394df5
Second attempt at one way xpopen().
Rob Landley <rob@landley.net>
parents:
1472
diff
changeset
|
228 *pipe = pid ? pipes[!!stdout] : -1; |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
229 |
|
1473
bff076394df5
Second attempt at one way xpopen().
Rob Landley <rob@landley.net>
parents:
1472
diff
changeset
|
230 return pid; |
|
1472
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
231 } |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
232 |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
233 int xpclose(pid_t pid, int pipe) |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
234 { |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
235 close(pipe); |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
236 |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
237 return xpclose_both(pid, 0); |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
238 } |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
239 |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
240 // Call xpopen and wait for it to finish, keeping existing stdin/stdout. |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
241 int xrun(char **argv) |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
242 { |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
243 return xpclose_both(xpopen_both(argv, 0), 0); |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
244 } |
|
2f9bc9495144
Split xpopen() into xpopen_both(), xpopen(), and xrun() depending on whether we want to redirect both, one, or neither of stdin/stdout.
Rob Landley <rob@landley.net>
parents:
1420
diff
changeset
|
245 |
| 951 | 246 void xaccess(char *path, int flags) |
| 247 { | |
| 248 if (access(path, flags)) perror_exit("Can't access '%s'", path); | |
| 249 } | |
| 250 | |
| 251 // Die unless we can delete a file. (File must exist to be deleted.) | |
| 252 void xunlink(char *path) | |
| 253 { | |
| 254 if (unlink(path)) perror_exit("unlink '%s'", path); | |
| 255 } | |
| 256 | |
| 257 // Die unless we can open/create a file, returning file descriptor. | |
| 258 int xcreate(char *path, int flags, int mode) | |
| 259 { | |
|
1403
411cf82cdf77
Default xcreate/xopen to O_CLOEXEC. (Pass O_CLOEXEC in the flags to switch it back off.)
Rob Landley <rob@landley.net>
parents:
1400
diff
changeset
|
260 int fd = open(path, flags^O_CLOEXEC, mode); |
| 951 | 261 if (fd == -1) perror_exit("%s", path); |
| 262 return fd; | |
| 263 } | |
| 264 | |
| 265 // Die unless we can open a file, returning file descriptor. | |
| 266 int xopen(char *path, int flags) | |
| 267 { | |
| 268 return xcreate(path, flags, 0); | |
| 269 } | |
| 270 | |
| 271 void xclose(int fd) | |
| 272 { | |
| 273 if (close(fd)) perror_exit("xclose"); | |
| 274 } | |
| 275 | |
| 276 int xdup(int fd) | |
| 277 { | |
| 278 if (fd != -1) { | |
| 279 fd = dup(fd); | |
| 280 if (fd == -1) perror_exit("xdup"); | |
| 281 } | |
| 282 return fd; | |
| 283 } | |
| 284 | |
|
991
252caf3d2b88
Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents:
956
diff
changeset
|
285 FILE *xfdopen(int fd, char *mode) |
|
252caf3d2b88
Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents:
956
diff
changeset
|
286 { |
|
252caf3d2b88
Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents:
956
diff
changeset
|
287 FILE *f = fdopen(fd, mode); |
|
252caf3d2b88
Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents:
956
diff
changeset
|
288 |
|
252caf3d2b88
Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents:
956
diff
changeset
|
289 if (!f) perror_exit("xfdopen"); |
|
252caf3d2b88
Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents:
956
diff
changeset
|
290 |
|
252caf3d2b88
Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents:
956
diff
changeset
|
291 return f; |
|
252caf3d2b88
Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents:
956
diff
changeset
|
292 } |
|
252caf3d2b88
Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents:
956
diff
changeset
|
293 |
| 951 | 294 // Die unless we can open/create a file, returning FILE *. |
| 295 FILE *xfopen(char *path, char *mode) | |
| 296 { | |
| 297 FILE *f = fopen(path, mode); | |
| 298 if (!f) perror_exit("No file %s", path); | |
| 299 return f; | |
| 300 } | |
| 301 | |
| 302 // Die if there's an error other than EOF. | |
| 303 size_t xread(int fd, void *buf, size_t len) | |
| 304 { | |
| 305 ssize_t ret = read(fd, buf, len); | |
| 306 if (ret < 0) perror_exit("xread"); | |
| 307 | |
| 308 return ret; | |
| 309 } | |
| 310 | |
| 311 void xreadall(int fd, void *buf, size_t len) | |
| 312 { | |
| 313 if (len != readall(fd, buf, len)) perror_exit("xreadall"); | |
| 314 } | |
| 315 | |
| 316 // There's no xwriteall(), just xwrite(). When we read, there may or may not | |
| 317 // be more data waiting. When we write, there is data and it had better go | |
| 318 // somewhere. | |
| 319 | |
| 320 void xwrite(int fd, void *buf, size_t len) | |
| 321 { | |
| 322 if (len != writeall(fd, buf, len)) perror_exit("xwrite"); | |
| 323 } | |
| 324 | |
| 325 // Die if lseek fails, probably due to being called on a pipe. | |
| 326 | |
| 327 off_t xlseek(int fd, off_t offset, int whence) | |
| 328 { | |
| 329 offset = lseek(fd, offset, whence); | |
| 330 if (offset<0) perror_exit("lseek"); | |
| 331 | |
| 332 return offset; | |
| 333 } | |
| 334 | |
| 335 char *xgetcwd(void) | |
| 336 { | |
| 337 char *buf = getcwd(NULL, 0); | |
| 338 if (!buf) perror_exit("xgetcwd"); | |
| 339 | |
| 340 return buf; | |
| 341 } | |
| 342 | |
| 343 void xstat(char *path, struct stat *st) | |
| 344 { | |
| 345 if(stat(path, st)) perror_exit("Can't stat %s", path); | |
| 346 } | |
| 347 | |
| 348 // Cannonicalize path, even to file with one or more missing components at end. | |
| 349 // if exact, require last path component to exist | |
| 350 char *xabspath(char *path, int exact) | |
| 351 { | |
| 352 struct string_list *todo, *done = 0; | |
| 353 int try = 9999, dirfd = open("/", 0);; | |
| 354 char buf[4096], *ret; | |
| 355 | |
| 356 // If this isn't an absolute path, start with cwd. | |
| 357 if (*path != '/') { | |
| 358 char *temp = xgetcwd(); | |
| 359 | |
| 360 splitpath(path, splitpath(temp, &todo)); | |
| 361 free(temp); | |
| 362 } else splitpath(path, &todo); | |
| 363 | |
| 364 // Iterate through path components | |
| 365 while (todo) { | |
| 366 struct string_list *new = llist_pop(&todo), **tail; | |
| 367 ssize_t len; | |
| 368 | |
| 369 if (!try--) { | |
| 370 errno = ELOOP; | |
| 371 goto error; | |
| 372 } | |
| 373 | |
| 374 // Removable path componenents. | |
| 375 if (!strcmp(new->str, ".") || !strcmp(new->str, "..")) { | |
| 376 int x = new->str[1]; | |
| 377 | |
| 378 free(new); | |
| 379 if (x) { | |
| 380 if (done) free(llist_pop(&done)); | |
| 381 len = 0; | |
| 382 } else continue; | |
| 383 | |
| 384 // Is this a symlink? | |
| 385 } else len=readlinkat(dirfd, new->str, buf, 4096); | |
| 386 | |
| 387 if (len>4095) goto error; | |
| 388 if (len<1) { | |
| 389 int fd; | |
| 390 char *s = ".."; | |
| 391 | |
| 392 // For .. just move dirfd | |
| 393 if (len) { | |
| 394 // Not a symlink: add to linked list, move dirfd, fail if error | |
| 395 if ((exact || todo) && errno != EINVAL) goto error; | |
| 396 new->next = done; | |
| 397 done = new; | |
| 398 if (errno == EINVAL && !todo) break; | |
| 399 s = new->str; | |
| 400 } | |
| 401 fd = openat(dirfd, s, 0); | |
| 402 if (fd == -1 && (exact || todo || errno != ENOENT)) goto error; | |
| 403 close(dirfd); | |
| 404 dirfd = fd; | |
| 405 continue; | |
| 406 } | |
| 407 | |
| 408 // If this symlink is to an absolute path, discard existing resolved path | |
| 409 buf[len] = 0; | |
| 410 if (*buf == '/') { | |
| 411 llist_traverse(done, free); | |
| 412 done=0; | |
| 413 close(dirfd); | |
| 414 dirfd = open("/", 0); | |
| 415 } | |
| 416 free(new); | |
| 417 | |
| 418 // prepend components of new path. Note symlink to "/" will leave new NULL | |
| 419 tail = splitpath(buf, &new); | |
| 420 | |
| 421 // symlink to "/" will return null and leave tail alone | |
| 422 if (new) { | |
| 423 *tail = todo; | |
| 424 todo = new; | |
| 425 } | |
| 426 } | |
| 427 close(dirfd); | |
| 428 | |
| 429 // At this point done has the path, in reverse order. Reverse list while | |
| 430 // calculating buffer length. | |
| 431 | |
| 432 try = 2; | |
| 433 while (done) { | |
| 434 struct string_list *temp = llist_pop(&done);; | |
| 435 | |
| 436 if (todo) try++; | |
| 437 try += strlen(temp->str); | |
| 438 temp->next = todo; | |
| 439 todo = temp; | |
| 440 } | |
| 441 | |
| 442 // Assemble return buffer | |
| 443 | |
| 444 ret = xmalloc(try); | |
| 445 *ret = '/'; | |
| 446 ret [try = 1] = 0; | |
| 447 while (todo) { | |
| 448 if (try>1) ret[try++] = '/'; | |
| 449 try = stpcpy(ret+try, todo->str) - ret; | |
| 450 free(llist_pop(&todo)); | |
| 451 } | |
| 452 | |
| 453 return ret; | |
| 454 | |
| 455 error: | |
| 456 close(dirfd); | |
| 457 llist_traverse(todo, free); | |
| 458 llist_traverse(done, free); | |
| 459 | |
| 460 return NULL; | |
| 461 } | |
| 462 | |
| 463 void xchdir(char *path) | |
| 464 { | |
| 465 if (chdir(path)) error_exit("chdir '%s'", path); | |
| 466 } | |
| 467 | |
|
1156
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
468 void xchroot(char *path) |
|
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
469 { |
|
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
470 if (chroot(path)) error_exit("chroot '%s'", path); |
|
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
471 xchdir("/"); |
|
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
472 } |
|
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
473 |
|
1129
c644f85444d0
Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents:
1105
diff
changeset
|
474 struct passwd *xgetpwuid(uid_t uid) |
|
c644f85444d0
Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents:
1105
diff
changeset
|
475 { |
|
c644f85444d0
Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents:
1105
diff
changeset
|
476 struct passwd *pwd = getpwuid(uid); |
|
1130
6df194c6de88
Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents:
1129
diff
changeset
|
477 if (!pwd) error_exit("bad uid %ld", (long)uid); |
|
1129
c644f85444d0
Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents:
1105
diff
changeset
|
478 return pwd; |
|
c644f85444d0
Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents:
1105
diff
changeset
|
479 } |
|
c644f85444d0
Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents:
1105
diff
changeset
|
480 |
|
c644f85444d0
Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents:
1105
diff
changeset
|
481 struct group *xgetgrgid(gid_t gid) |
|
c644f85444d0
Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents:
1105
diff
changeset
|
482 { |
|
c644f85444d0
Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents:
1105
diff
changeset
|
483 struct group *group = getgrgid(gid); |
|
1400
31cb9ba1815c
Improve gid/uid error messages.
Rob Landley <rob@landley.net>
parents:
1334
diff
changeset
|
484 |
|
31cb9ba1815c
Improve gid/uid error messages.
Rob Landley <rob@landley.net>
parents:
1334
diff
changeset
|
485 if (!group) perror_exit("gid %ld", (long)gid); |
|
1129
c644f85444d0
Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents:
1105
diff
changeset
|
486 return group; |
|
c644f85444d0
Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents:
1105
diff
changeset
|
487 } |
|
c644f85444d0
Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents:
1105
diff
changeset
|
488 |
|
1130
6df194c6de88
Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents:
1129
diff
changeset
|
489 struct passwd *xgetpwnam(char *name) |
|
6df194c6de88
Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents:
1129
diff
changeset
|
490 { |
|
6df194c6de88
Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents:
1129
diff
changeset
|
491 struct passwd *up = getpwnam(name); |
|
1400
31cb9ba1815c
Improve gid/uid error messages.
Rob Landley <rob@landley.net>
parents:
1334
diff
changeset
|
492 |
|
31cb9ba1815c
Improve gid/uid error messages.
Rob Landley <rob@landley.net>
parents:
1334
diff
changeset
|
493 if (!up) perror_exit("user '%s'", name); |
|
1130
6df194c6de88
Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents:
1129
diff
changeset
|
494 return up; |
|
6df194c6de88
Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents:
1129
diff
changeset
|
495 } |
|
6df194c6de88
Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents:
1129
diff
changeset
|
496 |
|
1420
9d760c092c41
Implement exec -user, -group, and -newer. Enable find in defconfig.
Rob Landley <rob@landley.net>
parents:
1408
diff
changeset
|
497 struct group *xgetgrnam(char *name) |
|
9d760c092c41
Implement exec -user, -group, and -newer. Enable find in defconfig.
Rob Landley <rob@landley.net>
parents:
1408
diff
changeset
|
498 { |
|
9d760c092c41
Implement exec -user, -group, and -newer. Enable find in defconfig.
Rob Landley <rob@landley.net>
parents:
1408
diff
changeset
|
499 struct group *gr = getgrnam(name); |
|
9d760c092c41
Implement exec -user, -group, and -newer. Enable find in defconfig.
Rob Landley <rob@landley.net>
parents:
1408
diff
changeset
|
500 |
|
9d760c092c41
Implement exec -user, -group, and -newer. Enable find in defconfig.
Rob Landley <rob@landley.net>
parents:
1408
diff
changeset
|
501 if (!gr) perror_exit("group '%s'", name); |
|
9d760c092c41
Implement exec -user, -group, and -newer. Enable find in defconfig.
Rob Landley <rob@landley.net>
parents:
1408
diff
changeset
|
502 return gr; |
|
9d760c092c41
Implement exec -user, -group, and -newer. Enable find in defconfig.
Rob Landley <rob@landley.net>
parents:
1408
diff
changeset
|
503 } |
|
9d760c092c41
Implement exec -user, -group, and -newer. Enable find in defconfig.
Rob Landley <rob@landley.net>
parents:
1408
diff
changeset
|
504 |
|
1156
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
505 // setuid() can fail (for example, too many processes belonging to that user), |
|
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
506 // which opens a security hole if the process continues as the original user. |
|
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
507 |
|
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
508 void xsetuser(struct passwd *pwd) |
|
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
509 { |
|
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
510 if (initgroups(pwd->pw_name, pwd->pw_gid) || setgid(pwd->pw_uid) |
|
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
511 || setuid(pwd->pw_uid)) perror_exit("xsetuser '%s'", pwd->pw_name); |
|
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
512 } |
|
faf7117c4489
Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents:
1130
diff
changeset
|
513 |
| 951 | 514 // This can return null (meaning file not found). It just won't return null |
| 515 // for memory allocation reasons. | |
| 516 char *xreadlink(char *name) | |
| 517 { | |
| 518 int len, size = 0; | |
| 519 char *buf = 0; | |
| 520 | |
| 521 // Grow by 64 byte chunks until it's big enough. | |
| 522 for(;;) { | |
| 523 size +=64; | |
| 524 buf = xrealloc(buf, size); | |
| 525 len = readlink(name, buf, size); | |
| 526 | |
| 527 if (len<0) { | |
| 528 free(buf); | |
| 529 return 0; | |
| 530 } | |
| 531 if (len<size) { | |
| 532 buf[len]=0; | |
| 533 return buf; | |
| 534 } | |
| 535 } | |
| 536 } | |
| 537 | |
|
1170
8afe1fde9314
Pass through all the readfile() arguments from xreadfile().
Rob Landley <rob@landley.net>
parents:
1156
diff
changeset
|
538 char *xreadfile(char *name, char *buf, off_t len) |
| 951 | 539 { |
|
1170
8afe1fde9314
Pass through all the readfile() arguments from xreadfile().
Rob Landley <rob@landley.net>
parents:
1156
diff
changeset
|
540 if (!(buf = readfile(name, buf, len))) perror_exit("Bad '%s'", name); |
|
8afe1fde9314
Pass through all the readfile() arguments from xreadfile().
Rob Landley <rob@landley.net>
parents:
1156
diff
changeset
|
541 |
| 951 | 542 return buf; |
| 543 } | |
| 544 | |
| 545 int xioctl(int fd, int request, void *data) | |
| 546 { | |
| 547 int rc; | |
| 548 | |
| 549 errno = 0; | |
| 550 rc = ioctl(fd, request, data); | |
| 551 if (rc == -1 && errno) perror_exit("ioctl %x", request); | |
| 552 | |
| 553 return rc; | |
| 554 } | |
| 555 | |
| 556 // Open a /var/run/NAME.pid file, dying if we can't write it or if it currently | |
| 557 // exists and is this executable. | |
| 558 void xpidfile(char *name) | |
| 559 { | |
| 560 char pidfile[256], spid[32]; | |
| 561 int i, fd; | |
| 562 pid_t pid; | |
| 563 | |
| 564 sprintf(pidfile, "/var/run/%s.pid", name); | |
| 565 // Try three times to open the sucker. | |
| 566 for (i=0; i<3; i++) { | |
| 1028 | 567 fd = open(pidfile, O_CREAT|O_EXCL|O_WRONLY, 0644); |
| 951 | 568 if (fd != -1) break; |
| 569 | |
| 570 // If it already existed, read it. Loop for race condition. | |
| 571 fd = open(pidfile, O_RDONLY); | |
| 572 if (fd == -1) continue; | |
| 573 | |
| 574 // Is the old program still there? | |
| 575 spid[xread(fd, spid, sizeof(spid)-1)] = 0; | |
| 576 close(fd); | |
| 577 pid = atoi(spid); | |
|
1053
501fd74c028e
Fix for xpidfile spotted by Felix Janda.
Rob Landley <rob@landley.net>
parents:
1043
diff
changeset
|
578 if (pid < 1 || (kill(pid, 0) && errno == ESRCH)) unlink(pidfile); |
| 951 | 579 |
| 580 // An else with more sanity checking might be nice here. | |
| 581 } | |
| 582 | |
| 583 if (i == 3) error_exit("xpidfile %s", name); | |
| 584 | |
| 585 xwrite(fd, spid, sprintf(spid, "%ld\n", (long)getpid())); | |
| 586 close(fd); | |
| 587 } | |
| 588 | |
| 589 // Copy the rest of in to out and close both files. | |
| 590 | |
| 591 void xsendfile(int in, int out) | |
| 592 { | |
| 593 long len; | |
| 594 | |
| 595 if (in<0) return; | |
| 596 for (;;) { | |
| 1583 | 597 len = xread(in, libbuf, sizeof(libbuf)); |
| 951 | 598 if (len<1) break; |
| 1583 | 599 xwrite(out, libbuf, len); |
| 951 | 600 } |
| 601 } | |
|
952
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
602 |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
603 // parse fractional seconds with optional s/m/h/d suffix |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
604 long xparsetime(char *arg, long units, long *fraction) |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
605 { |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
606 double d; |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
607 long l; |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
608 |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
609 if (CFG_TOYBOX_FLOAT) d = strtod(arg, &arg); |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
610 else l = strtoul(arg, &arg, 10); |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
611 |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
612 // Parse suffix |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
613 if (*arg) { |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
614 int ismhd[]={1,60,3600,86400}, i = stridx("smhd", *arg); |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
615 |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
616 if (i == -1) error_exit("Unknown suffix '%c'", *arg); |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
617 if (CFG_TOYBOX_FLOAT) d *= ismhd[i]; |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
618 else l *= ismhd[i]; |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
619 } |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
620 |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
621 if (CFG_TOYBOX_FLOAT) { |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
622 l = (long)d; |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
623 if (fraction) *fraction = units*(d-l); |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
624 } else if (fraction) *fraction = 0; |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
625 |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
626 return l; |
|
ce0519f6457c
Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents:
951
diff
changeset
|
627 } |
|
1235
63db77909fc8
Group headers by standard (POSIX or LSB) or function (internationalization, networking). Move headers standards ignore (but which have been there >15 years) to lib/portability.h. Fold xregcomp into lib since it's posix.
Rob Landley <rob@landley.net>
parents:
1219
diff
changeset
|
628 |
|
63db77909fc8
Group headers by standard (POSIX or LSB) or function (internationalization, networking). Move headers standards ignore (but which have been there >15 years) to lib/portability.h. Fold xregcomp into lib since it's posix.
Rob Landley <rob@landley.net>
parents:
1219
diff
changeset
|
629 // Compile a regular expression into a regex_t |
|
63db77909fc8
Group headers by standard (POSIX or LSB) or function (internationalization, networking). Move headers standards ignore (but which have been there >15 years) to lib/portability.h. Fold xregcomp into lib since it's posix.
Rob Landley <rob@landley.net>
parents:
1219
diff
changeset
|
630 void xregcomp(regex_t *preg, char *regex, int cflags) |
|
63db77909fc8
Group headers by standard (POSIX or LSB) or function (internationalization, networking). Move headers standards ignore (but which have been there >15 years) to lib/portability.h. Fold xregcomp into lib since it's posix.
Rob Landley <rob@landley.net>
parents:
1219
diff
changeset
|
631 { |
|
63db77909fc8
Group headers by standard (POSIX or LSB) or function (internationalization, networking). Move headers standards ignore (but which have been there >15 years) to lib/portability.h. Fold xregcomp into lib since it's posix.
Rob Landley <rob@landley.net>
parents:
1219
diff
changeset
|
632 int rc = regcomp(preg, regex, cflags); |
|
63db77909fc8
Group headers by standard (POSIX or LSB) or function (internationalization, networking). Move headers standards ignore (but which have been there >15 years) to lib/portability.h. Fold xregcomp into lib since it's posix.
Rob Landley <rob@landley.net>
parents:
1219
diff
changeset
|
633 |
|
63db77909fc8
Group headers by standard (POSIX or LSB) or function (internationalization, networking). Move headers standards ignore (but which have been there >15 years) to lib/portability.h. Fold xregcomp into lib since it's posix.
Rob Landley <rob@landley.net>
parents:
1219
diff
changeset
|
634 if (rc) { |
|
63db77909fc8
Group headers by standard (POSIX or LSB) or function (internationalization, networking). Move headers standards ignore (but which have been there >15 years) to lib/portability.h. Fold xregcomp into lib since it's posix.
Rob Landley <rob@landley.net>
parents:
1219
diff
changeset
|
635 regerror(rc, preg, libbuf, sizeof(libbuf)); |
|
63db77909fc8
Group headers by standard (POSIX or LSB) or function (internationalization, networking). Move headers standards ignore (but which have been there >15 years) to lib/portability.h. Fold xregcomp into lib since it's posix.
Rob Landley <rob@landley.net>
parents:
1219
diff
changeset
|
636 error_exit("xregcomp: %s", libbuf); |
|
63db77909fc8
Group headers by standard (POSIX or LSB) or function (internationalization, networking). Move headers standards ignore (but which have been there >15 years) to lib/portability.h. Fold xregcomp into lib since it's posix.
Rob Landley <rob@landley.net>
parents:
1219
diff
changeset
|
637 } |
|
63db77909fc8
Group headers by standard (POSIX or LSB) or function (internationalization, networking). Move headers standards ignore (but which have been there >15 years) to lib/portability.h. Fold xregcomp into lib since it's posix.
Rob Landley <rob@landley.net>
parents:
1219
diff
changeset
|
638 } |