annotate lib/xwrap.c @ 1183:0752b2d58909 draft

Rename xmsprintf() to just xmprintf(). Partly because there's no supplied target string ala sprintf, and partly because I can never remember what order the m and s go in.
author Rob Landley <rob@landley.net>
date Thu, 16 Jan 2014 09:26:50 -0600
parents 8afe1fde9314
children 468444e5c7c5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
951
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
1 /* xwrap.c - wrappers around existing library functions.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
2 *
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
3 * Functions with the x prefix are wrappers that either succeed or kill the
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
4 * program with an error message, but never return failure. They usually have
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
5 * the same arguments and return value as the function they wrap.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
6 *
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
7 * Copyright 2006 Rob Landley <rob@landley.net>
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
8 */
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
9
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
10 #include "toys.h"
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
11
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
12 // Strcpy with size checking: exit if there's not enough space for the string.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
13 void xstrncpy(char *dest, char *src, size_t size)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
14 {
1105
1bca28705a87 Give xstrncpy() a more informative error message.
Rob Landley <rob@landley.net>
parents: 1053
diff changeset
15 if (strlen(src)+1 > size) error_exit("'%s' > %ld bytes", src, (long)size);
951
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
16 strcpy(dest, src);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
17 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
18
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
19 void xexit(void)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
20 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
21 if (toys.rebound) longjmp(*toys.rebound, 1);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
22 else exit(toys.exitval);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
23 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
24
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
25 // Die unless we can allocate memory.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
26 void *xmalloc(size_t size)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
27 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
28 void *ret = malloc(size);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
29 if (!ret) error_exit("xmalloc");
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
30
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
31 return ret;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
32 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
33
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
34 // Die unless we can allocate prezeroed memory.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
35 void *xzalloc(size_t size)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
36 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
37 void *ret = xmalloc(size);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
38 memset(ret, 0, size);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
39 return ret;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
40 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
41
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
42 // Die unless we can change the size of an existing allocation, possibly
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
43 // moving it. (Notice different arguments from libc function.)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
44 void *xrealloc(void *ptr, size_t size)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
45 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
46 ptr = realloc(ptr, size);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
47 if (!ptr) error_exit("xrealloc");
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
48
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
49 return ptr;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
50 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
51
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
52 // Die unless we can allocate a copy of this many bytes of string.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
53 char *xstrndup(char *s, size_t n)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
54 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
55 char *ret = xmalloc(++n);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
56 strncpy(ret, s, n);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
57 ret[--n]=0;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
58
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
59 return ret;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
60 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
61
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
62 // Die unless we can allocate a copy of this string.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
63 char *xstrdup(char *s)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
64 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
65 return xstrndup(s, strlen(s));
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
66 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
67
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
68 // 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
69 char *xmprintf(char *format, ...)
951
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
70 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
71 va_list va, va2;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
72 int len;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
73 char *ret;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
74
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
75 va_start(va, format);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
76 va_copy(va2, va);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
77
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
78 // How long is it?
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
79 len = vsnprintf(0, 0, format, va);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
80 len++;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
81 va_end(va);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
82
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
83 // Allocate and do the sprintf()
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
84 ret = xmalloc(len);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
85 vsnprintf(ret, len, format, va2);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
86 va_end(va2);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
87
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
88 return ret;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
89 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
90
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
91 void xprintf(char *format, ...)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
92 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
93 va_list va;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
94 va_start(va, format);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
95
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
96 vprintf(format, va);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
97 if (ferror(stdout)) perror_exit("write");
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
98 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
99
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
100 void xputs(char *s)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
101 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
102 if (EOF == puts(s) || fflush(stdout)) perror_exit("write");
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
103 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
104
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
105 void xputc(char c)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
106 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
107 if (EOF == fputc(c, stdout) || fflush(stdout)) perror_exit("write");
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
108 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
109
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
110 void xflush(void)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
111 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
112 if (fflush(stdout)) perror_exit("write");;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
113 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
114
952
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
115 // 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
116 // 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
117 void xexec_optargs(int skip)
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
118 {
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
119 char **s = toys.optargs;
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
120
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
121 toys.optargs = 0;
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
122 xexec(s+skip);
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
123 }
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
124
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
125
951
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
126 // Die unless we can exec argv[] (or run builtin command). Note that anything
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
127 // with a path isn't a builtin, so /bin/sh won't match the builtin sh.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
128 void xexec(char **argv)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
129 {
1032
40d0c96a8e89 Add scripts/single.sh to build individual non-multiplexed standalone commands.
Rob Landley <rob@landley.net>
parents: 1028
diff changeset
130 if (CFG_TOYBOX) toy_exec(argv);
951
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
131 execvp(argv[0], argv);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
132
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
133 perror_exit("exec %s", argv[0]);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
134 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
135
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
136 void xaccess(char *path, int flags)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
137 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
138 if (access(path, flags)) perror_exit("Can't access '%s'", path);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
139 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
140
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
141 // Die unless we can delete a file. (File must exist to be deleted.)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
142 void xunlink(char *path)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
143 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
144 if (unlink(path)) perror_exit("unlink '%s'", path);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
145 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
146
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
147 // Die unless we can open/create a file, returning file descriptor.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
148 int xcreate(char *path, int flags, int mode)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
149 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
150 int fd = open(path, flags, mode);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
151 if (fd == -1) perror_exit("%s", path);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
152 return fd;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
153 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
154
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
155 // Die unless we can open a file, returning file descriptor.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
156 int xopen(char *path, int flags)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
157 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
158 return xcreate(path, flags, 0);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
159 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
160
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
161 void xclose(int fd)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
162 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
163 if (close(fd)) perror_exit("xclose");
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
164 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
165
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
166 int xdup(int fd)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
167 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
168 if (fd != -1) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
169 fd = dup(fd);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
170 if (fd == -1) perror_exit("xdup");
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
171 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
172 return fd;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
173 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
174
991
252caf3d2b88 Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents: 956
diff changeset
175 FILE *xfdopen(int fd, char *mode)
252caf3d2b88 Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents: 956
diff changeset
176 {
252caf3d2b88 Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents: 956
diff changeset
177 FILE *f = fdopen(fd, mode);
252caf3d2b88 Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents: 956
diff changeset
178
252caf3d2b88 Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents: 956
diff changeset
179 if (!f) perror_exit("xfdopen");
252caf3d2b88 Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents: 956
diff changeset
180
252caf3d2b88 Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents: 956
diff changeset
181 return f;
252caf3d2b88 Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents: 956
diff changeset
182 }
252caf3d2b88 Forgot to check in xfdopen(). My bad.
Rob Landley <rob@landley.net>
parents: 956
diff changeset
183
951
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
184 // Die unless we can open/create a file, returning FILE *.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
185 FILE *xfopen(char *path, char *mode)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
186 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
187 FILE *f = fopen(path, mode);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
188 if (!f) perror_exit("No file %s", path);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
189 return f;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
190 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
191
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
192 // Die if there's an error other than EOF.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
193 size_t xread(int fd, void *buf, size_t len)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
194 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
195 ssize_t ret = read(fd, buf, len);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
196 if (ret < 0) perror_exit("xread");
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
197
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
198 return ret;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
199 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
200
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
201 void xreadall(int fd, void *buf, size_t len)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
202 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
203 if (len != readall(fd, buf, len)) perror_exit("xreadall");
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
204 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
205
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
206 // There's no xwriteall(), just xwrite(). When we read, there may or may not
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
207 // be more data waiting. When we write, there is data and it had better go
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
208 // somewhere.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
209
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
210 void xwrite(int fd, void *buf, size_t len)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
211 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
212 if (len != writeall(fd, buf, len)) perror_exit("xwrite");
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
213 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
214
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
215 // Die if lseek fails, probably due to being called on a pipe.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
216
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
217 off_t xlseek(int fd, off_t offset, int whence)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
218 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
219 offset = lseek(fd, offset, whence);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
220 if (offset<0) perror_exit("lseek");
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
221
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
222 return offset;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
223 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
224
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
225 char *xgetcwd(void)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
226 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
227 char *buf = getcwd(NULL, 0);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
228 if (!buf) perror_exit("xgetcwd");
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
229
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
230 return buf;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
231 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
232
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
233 void xstat(char *path, struct stat *st)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
234 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
235 if(stat(path, st)) perror_exit("Can't stat %s", path);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
236 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
237
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
238 // Cannonicalize path, even to file with one or more missing components at end.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
239 // if exact, require last path component to exist
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
240 char *xabspath(char *path, int exact)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
241 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
242 struct string_list *todo, *done = 0;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
243 int try = 9999, dirfd = open("/", 0);;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
244 char buf[4096], *ret;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
245
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
246 // If this isn't an absolute path, start with cwd.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
247 if (*path != '/') {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
248 char *temp = xgetcwd();
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
249
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
250 splitpath(path, splitpath(temp, &todo));
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
251 free(temp);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
252 } else splitpath(path, &todo);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
253
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
254 // Iterate through path components
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
255 while (todo) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
256 struct string_list *new = llist_pop(&todo), **tail;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
257 ssize_t len;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
258
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
259 if (!try--) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
260 errno = ELOOP;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
261 goto error;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
262 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
263
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
264 // Removable path componenents.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
265 if (!strcmp(new->str, ".") || !strcmp(new->str, "..")) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
266 int x = new->str[1];
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
267
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
268 free(new);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
269 if (x) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
270 if (done) free(llist_pop(&done));
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
271 len = 0;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
272 } else continue;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
273
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
274 // Is this a symlink?
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
275 } else len=readlinkat(dirfd, new->str, buf, 4096);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
276
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
277 if (len>4095) goto error;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
278 if (len<1) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
279 int fd;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
280 char *s = "..";
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
281
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
282 // For .. just move dirfd
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
283 if (len) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
284 // Not a symlink: add to linked list, move dirfd, fail if error
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
285 if ((exact || todo) && errno != EINVAL) goto error;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
286 new->next = done;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
287 done = new;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
288 if (errno == EINVAL && !todo) break;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
289 s = new->str;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
290 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
291 fd = openat(dirfd, s, 0);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
292 if (fd == -1 && (exact || todo || errno != ENOENT)) goto error;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
293 close(dirfd);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
294 dirfd = fd;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
295 continue;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
296 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
297
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
298 // If this symlink is to an absolute path, discard existing resolved path
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
299 buf[len] = 0;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
300 if (*buf == '/') {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
301 llist_traverse(done, free);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
302 done=0;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
303 close(dirfd);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
304 dirfd = open("/", 0);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
305 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
306 free(new);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
307
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
308 // prepend components of new path. Note symlink to "/" will leave new NULL
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
309 tail = splitpath(buf, &new);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
310
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
311 // symlink to "/" will return null and leave tail alone
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
312 if (new) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
313 *tail = todo;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
314 todo = new;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
315 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
316 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
317 close(dirfd);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
318
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
319 // At this point done has the path, in reverse order. Reverse list while
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
320 // calculating buffer length.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
321
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
322 try = 2;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
323 while (done) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
324 struct string_list *temp = llist_pop(&done);;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
325
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
326 if (todo) try++;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
327 try += strlen(temp->str);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
328 temp->next = todo;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
329 todo = temp;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
330 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
331
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
332 // Assemble return buffer
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
333
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
334 ret = xmalloc(try);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
335 *ret = '/';
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
336 ret [try = 1] = 0;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
337 while (todo) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
338 if (try>1) ret[try++] = '/';
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
339 try = stpcpy(ret+try, todo->str) - ret;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
340 free(llist_pop(&todo));
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
341 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
342
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
343 return ret;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
344
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
345 error:
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
346 close(dirfd);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
347 llist_traverse(todo, free);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
348 llist_traverse(done, free);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
349
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
350 return NULL;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
351 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
352
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
353 // Resolve all symlinks, returning malloc() memory.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
354 char *xrealpath(char *path)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
355 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
356 char *new = realpath(path, NULL);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
357 if (!new) perror_exit("realpath '%s'", path);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
358 return new;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
359 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
360
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
361 void xchdir(char *path)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
362 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
363 if (chdir(path)) error_exit("chdir '%s'", path);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
364 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
365
1156
faf7117c4489 Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents: 1130
diff changeset
366 void xchroot(char *path)
faf7117c4489 Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents: 1130
diff changeset
367 {
faf7117c4489 Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents: 1130
diff changeset
368 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
369 xchdir("/");
faf7117c4489 Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents: 1130
diff changeset
370 }
faf7117c4489 Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents: 1130
diff changeset
371
951
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
372 // Ensure entire path exists.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
373 // If mode != -1 set permissions on newly created dirs.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
374 // Requires that path string be writable (for temporary null terminators).
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
375 void xmkpath(char *path, int mode)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
376 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
377 char *p, old;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
378 mode_t mask;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
379 int rc;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
380 struct stat st;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
381
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
382 for (p = path; ; p++) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
383 if (!*p || *p == '/') {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
384 old = *p;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
385 *p = rc = 0;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
386 if (stat(path, &st) || !S_ISDIR(st.st_mode)) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
387 if (mode != -1) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
388 mask=umask(0);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
389 rc = mkdir(path, mode);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
390 umask(mask);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
391 } else rc = mkdir(path, 0777);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
392 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
393 *p = old;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
394 if(rc) perror_exit("mkpath '%s'", path);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
395 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
396 if (!*p) break;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
397 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
398 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
399
1129
c644f85444d0 Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents: 1105
diff changeset
400 struct passwd *xgetpwuid(uid_t uid)
c644f85444d0 Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents: 1105
diff changeset
401 {
c644f85444d0 Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents: 1105
diff changeset
402 struct passwd *pwd = getpwuid(uid);
1130
6df194c6de88 Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents: 1129
diff changeset
403 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
404 return pwd;
c644f85444d0 Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents: 1105
diff changeset
405 }
c644f85444d0 Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents: 1105
diff changeset
406
c644f85444d0 Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents: 1105
diff changeset
407 struct group *xgetgrgid(gid_t gid)
c644f85444d0 Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents: 1105
diff changeset
408 {
c644f85444d0 Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents: 1105
diff changeset
409 struct group *group = getgrgid(gid);
1130
6df194c6de88 Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents: 1129
diff changeset
410 if (!group) error_exit("bad gid %ld", (long)gid);
1129
c644f85444d0 Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents: 1105
diff changeset
411 return group;
c644f85444d0 Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents: 1105
diff changeset
412 }
c644f85444d0 Move xgetpwuid() and xgetgrgid() into xwrap.c
Rob Landley <rob@landley.net>
parents: 1105
diff changeset
413
1130
6df194c6de88 Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents: 1129
diff changeset
414 struct passwd *xgetpwnam(char *name)
6df194c6de88 Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents: 1129
diff changeset
415 {
6df194c6de88 Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents: 1129
diff changeset
416 struct passwd *up = getpwnam(name);
6df194c6de88 Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents: 1129
diff changeset
417 if (!up) error_exit("bad user '%s'", name);
6df194c6de88 Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents: 1129
diff changeset
418 return up;
6df194c6de88 Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents: 1129
diff changeset
419 }
6df194c6de88 Add xgetpwnam() to lib/xwrap.c.
Rob Landley <rob@landley.net>
parents: 1129
diff changeset
420
1156
faf7117c4489 Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents: 1130
diff changeset
421 // 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
422 // 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
423
faf7117c4489 Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents: 1130
diff changeset
424 void xsetuser(struct passwd *pwd)
faf7117c4489 Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents: 1130
diff changeset
425 {
faf7117c4489 Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents: 1130
diff changeset
426 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
427 || 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
428 }
faf7117c4489 Fix some issues raised (albeit indirectly) by Isaac Dunham.
Rob Landley <rob@landley.net>
parents: 1130
diff changeset
429
951
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
430 // This can return null (meaning file not found). It just won't return null
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
431 // for memory allocation reasons.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
432 char *xreadlink(char *name)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
433 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
434 int len, size = 0;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
435 char *buf = 0;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
436
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
437 // Grow by 64 byte chunks until it's big enough.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
438 for(;;) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
439 size +=64;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
440 buf = xrealloc(buf, size);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
441 len = readlink(name, buf, size);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
442
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
443 if (len<0) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
444 free(buf);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
445 return 0;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
446 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
447 if (len<size) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
448 buf[len]=0;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
449 return buf;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
450 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
451 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
452 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
453
1170
8afe1fde9314 Pass through all the readfile() arguments from xreadfile().
Rob Landley <rob@landley.net>
parents: 1156
diff changeset
454 char *xreadfile(char *name, char *buf, off_t len)
951
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
455 {
1170
8afe1fde9314 Pass through all the readfile() arguments from xreadfile().
Rob Landley <rob@landley.net>
parents: 1156
diff changeset
456 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
457
951
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
458 return buf;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
459 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
460
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
461 int xioctl(int fd, int request, void *data)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
462 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
463 int rc;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
464
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
465 errno = 0;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
466 rc = ioctl(fd, request, data);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
467 if (rc == -1 && errno) perror_exit("ioctl %x", request);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
468
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
469 return rc;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
470 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
471
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
472 // Open a /var/run/NAME.pid file, dying if we can't write it or if it currently
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
473 // exists and is this executable.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
474 void xpidfile(char *name)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
475 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
476 char pidfile[256], spid[32];
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
477 int i, fd;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
478 pid_t pid;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
479
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
480 sprintf(pidfile, "/var/run/%s.pid", name);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
481 // Try three times to open the sucker.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
482 for (i=0; i<3; i++) {
1028
58bfd974216d syslogd: cleanup
Felix Janda <felix.janda at posteo.de>
parents: 991
diff changeset
483 fd = open(pidfile, O_CREAT|O_EXCL|O_WRONLY, 0644);
951
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
484 if (fd != -1) break;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
485
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
486 // If it already existed, read it. Loop for race condition.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
487 fd = open(pidfile, O_RDONLY);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
488 if (fd == -1) continue;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
489
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
490 // Is the old program still there?
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
491 spid[xread(fd, spid, sizeof(spid)-1)] = 0;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
492 close(fd);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
493 pid = atoi(spid);
1053
501fd74c028e Fix for xpidfile spotted by Felix Janda.
Rob Landley <rob@landley.net>
parents: 1043
diff changeset
494 if (pid < 1 || (kill(pid, 0) && errno == ESRCH)) unlink(pidfile);
951
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
495
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
496 // An else with more sanity checking might be nice here.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
497 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
498
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
499 if (i == 3) error_exit("xpidfile %s", name);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
500
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
501 xwrite(fd, spid, sprintf(spid, "%ld\n", (long)getpid()));
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
502 close(fd);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
503 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
504
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
505 // Copy the rest of in to out and close both files.
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
506
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
507 void xsendfile(int in, int out)
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
508 {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
509 long len;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
510 char buf[4096];
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
511
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
512 if (in<0) return;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
513 for (;;) {
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
514 len = xread(in, buf, 4096);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
515 if (len<1) break;
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
516 xwrite(out, buf, len);
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
517 }
62d59b8aea34 Split lib/xwrap.c from lib/lib.c
Rob Landley <rob@landley.net>
parents:
diff changeset
518 }
952
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
519
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
520 // 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
521 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
522 {
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
523 double d;
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
524 long l;
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
525
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
526 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
527 else l = strtoul(arg, &arg, 10);
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
528
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
529 // Parse suffix
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
530 if (*arg) {
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
531 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
532
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
533 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
534 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
535 else l *= ismhd[i];
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
536 }
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
537
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
538 if (CFG_TOYBOX_FLOAT) {
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
539 l = (long)d;
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
540 if (fraction) *fraction = units*(d-l);
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
541 } else if (fraction) *fraction = 0;
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
542
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
543 return l;
ce0519f6457c Add timeout, factoring out common code from sleep.
Rob Landley <rob@landley.net>
parents: 951
diff changeset
544 }