toybox: lib/lib.c annotate

annotate lib/lib.c @ 148:88dd003ccdf4

xcreate(): perror already prints error name and newline, remove redundancy.

author	Rob Landley <rob@landley.net>
date	Sun, 04 Nov 2007 15:31:06 -0600
parents	1fbc50374a30
children	58554af48c8b

rev	line source
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	1 /* vi: set sw=4 ts=4 :*/
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	2 /* functions.c - reusable stuff.
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	3 *
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	4 * Functions with the x prefix are wrappers for library functions. They either
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	5 * succeed or kill the program with an error message, but never return failure.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	6 * They usually have the same arguments and return value as the function they
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	7 * wrap.
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	8 *
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	9 * Copyright 2006 Rob Landley <rob@landley.net>
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	10 */
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	11
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	12 #include "toys.h"
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	13
137 0901b3b2bbe9 More klibc fixes from Maximilian Attems, strlcpy() this time. Rob Landley <rob@landley.net> parents: 128 diff changeset	14 #if !defined(__UCLIBC__) && !defined(__KLIBC__)
124 ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	15
ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	16 // uClibc has this, and if we define our own it conflicts.
ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	17
ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	18 // Like strncpy but always null terminated.
ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	19 void strlcpy(char dest, char src, size_t size)
ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	20 {
ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	21 strncpy(dest,src,size);
ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	22 dest[size-1] = 0;
ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	23 }
ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	24 #endif
ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	25
ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	26
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	27 void verror_msg(char *msg, int err, va_list va)
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	28 {
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	29 fprintf(stderr, "%s: ", toys.which->name);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	30 vfprintf(stderr, msg, va);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	31 if (err) fprintf(stderr, ": %s", strerror(err));
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	32 putc('\n', stderr);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	33 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	34
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	35 void error_msg(char *msg, ...)
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	36 {
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	37 va_list va;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	38
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	39 va_start(va, msg);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	40 verror_msg(msg, 0, va);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	41 va_end(va);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	42 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	43
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	44 void perror_msg(char *msg, ...)
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	45 {
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	46 va_list va;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	47
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	48 va_start(va, msg);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	49 verror_msg(msg, errno, va);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	50 va_end(va);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	51 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	52
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	53 // Die with an error message.
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	54 void error_exit(char *msg, ...)
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	55 {
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	56 va_list va;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	57
144 1fbc50374a30 Promote help to global config option, teach error_exit() to output usage message when called Rob Landley <rob@landley.net> parents: 143 diff changeset	58 if (CFG_HELP && toys.exithelp) {
1fbc50374a30 Promote help to global config option, teach error_exit() to output usage message when called Rob Landley <rob@landley.net> parents: 143 diff changeset	59 toys.optargs=toys.argv;
1fbc50374a30 Promote help to global config option, teach error_exit() to output usage message when called Rob Landley <rob@landley.net> parents: 143 diff changeset	60 help_main();
1fbc50374a30 Promote help to global config option, teach error_exit() to output usage message when called Rob Landley <rob@landley.net> parents: 143 diff changeset	61 fprintf(stderr,"\n");
1fbc50374a30 Promote help to global config option, teach error_exit() to output usage message when called Rob Landley <rob@landley.net> parents: 143 diff changeset	62 }
1fbc50374a30 Promote help to global config option, teach error_exit() to output usage message when called Rob Landley <rob@landley.net> parents: 143 diff changeset	63
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	64 va_start(va, msg);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	65 verror_msg(msg, 0, va);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	66 va_end(va);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	67
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	68 exit(toys.exitval);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	69 }
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	70
53 41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	71
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	72 // Die with an error message and strerror(errno)
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	73 void perror_exit(char *msg, ...)
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	74 {
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	75 va_list va;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	76
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	77 va_start(va, msg);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	78 verror_msg(msg, errno, va);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	79 va_end(va);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	80
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	81 exit(toys.exitval);
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	82 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	83
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	84 // Die unless we can allocate memory.
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	85 void *xmalloc(size_t size)
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	86 {
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	87 void *ret = malloc(size);
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	88 if (!ret) error_exit("xmalloc");
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	89
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	90 return ret;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	91 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	92
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	93 // Die unless we can allocate prezeroed memory.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	94 void *xzalloc(size_t size)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	95 {
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	96 void *ret = xmalloc(size);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	97 bzero(ret,size);
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	98 return ret;
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	99 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	100
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	101 // Die unless we can change the size of an existing allocation, possibly
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	102 // moving it. (Notice different arguments from libc function.)
115 19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	103 void xrealloc(void ptr, size_t size)
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	104 {
115 19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	105 ptr = realloc(ptr, size);
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	106 if (!ptr) error_exit("xrealloc");
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	107
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	108 return ptr;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	109 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	110
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	111 // Die unless we can allocate a copy of this many bytes of string.
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	112 void xstrndup(char s, size_t n)
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	113 {
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	114 void *ret = xmalloc(++n);
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	115 strlcpy(ret, s, n);
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	116
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	117 return ret;
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	118 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	119
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	120 // Die unless we can allocate a copy of this string.
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	121 void xstrdup(char s)
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	122 {
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	123 return xstrndup(s,strlen(s));
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	124 }
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	125
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	126 // Die unless we can allocate enough space to sprintf() into.
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	127 char xmsprintf(char format, ...)
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	128 {
126 7b22987a7b47 Vladimir Oleynik pointed out that va_start() twice in the same function Rob Landley <rob@landley.net> parents: 124 diff changeset	129 va_list va, va2;
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	130 int len;
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	131 char *ret;
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	132
126 7b22987a7b47 Vladimir Oleynik pointed out that va_start() twice in the same function Rob Landley <rob@landley.net> parents: 124 diff changeset	133 va_start(va, format);
7b22987a7b47 Vladimir Oleynik pointed out that va_start() twice in the same function Rob Landley <rob@landley.net> parents: 124 diff changeset	134 va_copy(va2, va);
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	135
126 7b22987a7b47 Vladimir Oleynik pointed out that va_start() twice in the same function Rob Landley <rob@landley.net> parents: 124 diff changeset	136 // How long is it?
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	137 len = vsnprintf(0, 0, format, va);
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	138 len++;
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	139 va_end(va);
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	140
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	141 // Allocate and do the sprintf()
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	142 ret = xmalloc(len);
126 7b22987a7b47 Vladimir Oleynik pointed out that va_start() twice in the same function Rob Landley <rob@landley.net> parents: 124 diff changeset	143 vsnprintf(ret, len, format, va2);
7b22987a7b47 Vladimir Oleynik pointed out that va_start() twice in the same function Rob Landley <rob@landley.net> parents: 124 diff changeset	144 va_end(va2);
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	145
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	146 return ret;
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	147 }
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	148
70 a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	149 void xprintf(char *format, ...)
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	150 {
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	151 va_list va;
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	152 va_start(va, format);
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	153
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	154 vprintf(format, va);
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	155 if (ferror(stdout)) perror_exit("write");
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	156 }
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	157
128 0a90a5fbc1bf Add xputs() to detect EOF on writes. Rob Landley <rob@landley.net> parents: 126 diff changeset	158 void xputs(char *s)
0a90a5fbc1bf Add xputs() to detect EOF on writes. Rob Landley <rob@landley.net> parents: 126 diff changeset	159 {
0a90a5fbc1bf Add xputs() to detect EOF on writes. Rob Landley <rob@landley.net> parents: 126 diff changeset	160 if (EOF == puts(s)) perror_exit("write");
0a90a5fbc1bf Add xputs() to detect EOF on writes. Rob Landley <rob@landley.net> parents: 126 diff changeset	161 }
0a90a5fbc1bf Add xputs() to detect EOF on writes. Rob Landley <rob@landley.net> parents: 126 diff changeset	162
70 a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	163 void xputc(char c)
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	164 {
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	165 if (EOF == fputc(c, stdout)) perror_exit("write");
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	166 }
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	167
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	168 void xflush(void)
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	169 {
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	170 if (fflush(stdout)) perror_exit("write");;
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	171 }
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	172
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	173 // Die unless we can exec argv[] (or run builtin command). Note that anything
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	174 // with a path isn't a builtin, so /bin/sh won't match the builtin sh.
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	175 void xexec(char **argv)
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	176 {
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	177 toy_exec(argv);
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	178 execvp(argv[0], argv);
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	179 error_exit("No %s", argv[0]);
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	180 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	181
51 63edd4de94dd Add xaccess() Rob Landley <rob@landley.net> parents: 50 diff changeset	182 void xaccess(char *path, int flags)
63edd4de94dd Add xaccess() Rob Landley <rob@landley.net> parents: 50 diff changeset	183 {
70 a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	184 if (access(path, flags)) perror_exit("Can't access '%s'\n", path);
51 63edd4de94dd Add xaccess() Rob Landley <rob@landley.net> parents: 50 diff changeset	185 }
63edd4de94dd Add xaccess() Rob Landley <rob@landley.net> parents: 50 diff changeset	186
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	187 // Die unless we can open/create a file, returning file descriptor.
49 bb4c38853a7d xopen() wants 2 arguments unless you're creating a file, in which case you Rob Landley <rob@landley.net> parents: 44 diff changeset	188 int xcreate(char *path, int flags, int mode)
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	189 {
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	190 int fd = open(path, flags, mode);
148 88dd003ccdf4 xcreate(): perror already prints error name and newline, remove redundancy. Rob Landley <rob@landley.net> parents: 144 diff changeset	191 if (fd == -1) perror_exit("%s", path);
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	192 return fd;
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	193 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	194
49 bb4c38853a7d xopen() wants 2 arguments unless you're creating a file, in which case you Rob Landley <rob@landley.net> parents: 44 diff changeset	195 // Die unless we can open a file, returning file descriptor.
bb4c38853a7d xopen() wants 2 arguments unless you're creating a file, in which case you Rob Landley <rob@landley.net> parents: 44 diff changeset	196 int xopen(char *path, int flags)
bb4c38853a7d xopen() wants 2 arguments unless you're creating a file, in which case you Rob Landley <rob@landley.net> parents: 44 diff changeset	197 {
bb4c38853a7d xopen() wants 2 arguments unless you're creating a file, in which case you Rob Landley <rob@landley.net> parents: 44 diff changeset	198 return xcreate(path, flags, 0);
bb4c38853a7d xopen() wants 2 arguments unless you're creating a file, in which case you Rob Landley <rob@landley.net> parents: 44 diff changeset	199 }
bb4c38853a7d xopen() wants 2 arguments unless you're creating a file, in which case you Rob Landley <rob@landley.net> parents: 44 diff changeset	200
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	201 // Die unless we can open/create a file, returning FILE *.
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	202 FILE xfopen(char path, char *mode)
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	203 {
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	204 FILE *f = fopen(path, mode);
70 a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	205 if (!f) perror_exit("No file %s\n", path);
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	206 return f;
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	207 }
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	208
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	209 // Keep reading until full or EOF
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	210 ssize_t readall(int fd, void *buf, size_t len)
50 63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	211 {
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	212 size_t count = 0;
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	213 while (count<len) {
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	214 int i = read(fd, buf+count, len-count);
8 04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	215 if (!i) return len;
04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	216 if (i<0) return i;
04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	217 count += i;
04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	218 }
04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	219
04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	220 return count;
04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	221 }
04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	222
50 63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	223 // Keep writing until done or EOF
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	224 ssize_t writeall(int fd, void *buf, size_t len)
50 63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	225 {
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	226 size_t count = 0;
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	227 while (count<len) {
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	228 int i = write(fd, buf+count, len-count);
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	229 if (i<1) return i;
50 63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	230 count += i;
63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	231 }
63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	232
63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	233 return count;
63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	234 }
63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	235
53 41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	236 // Die if there's an error other than EOF.
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	237 size_t xread(int fd, void *buf, size_t len)
8 04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	238 {
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	239 len = read(fd, buf, len);
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	240 if (len < 0) perror_exit("xread");
53 41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	241
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	242 return len;
53 41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	243 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	244
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	245 void xreadall(int fd, void *buf, size_t len)
53 41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	246 {
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	247 if (len != readall(fd, buf, len)) perror_exit("xreadall");
53 41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	248 }
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	249
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	250 // There's no xwriteall(), just xwrite(). When we read, there may or may not
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	251 // be more data waiting. When we write, there is data and it had better go
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	252 // somewhere.
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	253
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	254 void xwrite(int fd, void *buf, size_t len)
50 63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	255 {
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	256 if (len != writeall(fd, buf, len)) perror_exit("xwrite");
50 63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	257 }
63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	258
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	259 char *xgetcwd(void)
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	260 {
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	261 char *buf = getcwd(NULL, 0);
70 a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	262 if (!buf) perror_exit("xgetcwd");
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	263
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	264 return buf;
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	265 }
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	266
95 a636e4d20f13 Add xstat(), read_dirtree(), and read_dirtree_node(). Rob Landley <rob@landley.net> parents: 77 diff changeset	267 void xstat(char path, struct stat st)
a636e4d20f13 Add xstat(), read_dirtree(), and read_dirtree_node(). Rob Landley <rob@landley.net> parents: 77 diff changeset	268 {
a636e4d20f13 Add xstat(), read_dirtree(), and read_dirtree_node(). Rob Landley <rob@landley.net> parents: 77 diff changeset	269 if(stat(path, st)) perror_exit("Can't stat %s\n",path);
a636e4d20f13 Add xstat(), read_dirtree(), and read_dirtree_node(). Rob Landley <rob@landley.net> parents: 77 diff changeset	270 }
a636e4d20f13 Add xstat(), read_dirtree(), and read_dirtree_node(). Rob Landley <rob@landley.net> parents: 77 diff changeset	271
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	272 // Cannonicalizes path by removing ".", "..", and "//" elements. This is not
44 e74aa8b8660a Comment tweak. Rob Landley <rob@landley.net> parents: 20 diff changeset	273 // the same as realpath(), where "dir/.." could wind up somewhere else by
e74aa8b8660a Comment tweak. Rob Landley <rob@landley.net> parents: 20 diff changeset	274 // following symlinks.
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	275 char xabspath(char path)
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	276 {
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	277 char from, to;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	278
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	279 // If this isn't an absolute path, make it one with cwd.
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	280 if (path[0]!='/') {
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	281 char *cwd=xgetcwd();
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	282 path = xmsprintf("%s/%s",cwd,path);
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	283 free(cwd);
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	284 } else path = xstrdup(path);
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	285
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	286 // Loop through path elements
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	287 from = to = path;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	288 while (*from) {
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	289
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	290 // Continue any current path component.
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	291 if (*from!='/') {
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	292 (to++) = (from++);
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	293 continue;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	294 }
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	295
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	296 // Skip duplicate slashes.
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	297 while (*from=='/') from++;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	298
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	299 // Start of a new filename. Handle . and ..
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	300 while (*from=='.') {
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	301 // Skip .
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	302 if (from[1]=='/') from += 2;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	303 else if (!from[1]) from++;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	304 // Back up for ..
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	305 else if (from[1]=='.') {
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	306 if (from[2]=='/') from +=3;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	307 else if(!from[2]) from+=2;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	308 else break;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	309 while (to>path && *(--to)!='/');
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	310 } else break;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	311 }
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	312 // Add directory separator slash.
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	313 *(to++) = '/';
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	314 }
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	315 *to = 0;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	316
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	317 return path;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	318 }
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	319
20 3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	320 // Find all file in a colon-separated path with access type "type" (generally
3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	321 // X_OK or R_OK). Returns a list of absolute paths to each file found, in
3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	322 // order.
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	323
20 3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	324 struct string_list find_in_path(char path, char *filename)
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	325 {
20 3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	326 struct string_list *rlist = NULL;
3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	327 char *cwd = xgetcwd();
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	328
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	329 for (;;) {
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	330 char *next = path ? index(path, ':') : NULL;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	331 int len = next ? next-path : strlen(path);
20 3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	332 struct string_list *rnext;
3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	333 struct stat st;
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	334
20 3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	335 rnext = xmalloc(sizeof(void *) + strlen(filename)
3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	336 + (len ? len : strlen(cwd)) + 2);
3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	337 if (!len) sprintf(rnext->str, "%s/%s", cwd, filename);
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	338 else {
20 3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	339 char *res = rnext->str;
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	340 strncpy(res, path, len);
20 3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	341 res += len;
3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	342 *(res++) = '/';
3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	343 strcpy(res, filename);
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	344 }
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	345
20 3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	346 // Confirm it's not a directory.
3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	347 if (!stat(rnext->str, &st) && S_ISREG(st.st_mode)) {
3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	348 rnext->next = rlist;
3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	349 rlist = rnext;
3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	350 } else free(rnext);
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	351
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	352 if (!next) break;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	353 path += len;
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	354 path++;
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	355 }
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	356 free(cwd);
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	357
20 3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	358 return rlist;
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	359
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	360 }
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	361
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	362 // Convert unsigned int to ascii, writing into supplied buffer. A truncated
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	363 // result contains the first few digits of the result ala strncpy, and is
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	364 // always null terminated (unless buflen is 0).
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	365 void utoa_to_buf(unsigned n, char *buf, unsigned buflen)
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	366 {
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	367 int i, out = 0;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	368
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	369 if (buflen) {
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	370 for (i=1000000000; i; i/=10) {
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	371 int res = n/i;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	372
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	373 if ((res \|\| out \|\| i == 1) && --buflen>0) {
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	374 out++;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	375 n -= res*i;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	376 *buf++ = '0' + res;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	377 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	378 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	379 *buf = 0;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	380 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	381 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	382
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	383 // Convert signed integer to ascii, using utoa_to_buf()
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	384 void itoa_to_buf(int n, char *buf, unsigned buflen)
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	385 {
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	386 if (buflen && n<0) {
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	387 n = -n;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	388 *buf++ = '-';
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	389 buflen--;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	390 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	391 utoa_to_buf((unsigned)n, buf, buflen);
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	392 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	393
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	394 // This static buffer is used by both utoa() and itoa(), calling either one a
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	395 // second time will overwrite the previous results.
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	396 //
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	397 // The longest 32 bit integer is -2 billion plus a null terminator: 12 bytes.
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	398 // Note that int is always 32 bits on any remotely unix-like system, see
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	399 // http://www.unix.org/whitepapers/64bit.html for details.
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	400
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	401 static char itoa_buf[12];
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	402
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	403 // Convert unsigned integer to ascii, returning a static buffer.
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	404 char *utoa(unsigned n)
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	405 {
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	406 utoa_to_buf(n, itoa_buf, sizeof(itoa_buf));
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	407
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	408 return itoa_buf;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	409 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	410
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	411 char *itoa(int n)
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	412 {
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	413 itoa_to_buf(n, itoa_buf, sizeof(itoa_buf));
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	414
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	415 return itoa_buf;
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	416 }
53 41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	417
102 aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	418 // atol() with the kilo/mega/giga/tera/peta/exa extensions.
aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	419 // (zetta and yotta don't fit in 64 bits.)
aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	420 long atolx(char *c)
aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	421 {
aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	422 char suffixes="kmgtpe", end;
aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	423 long val = strtol(c, &c, 0);
aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	424
aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	425 end = strchr(suffixes, tolower(*c));
aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	426 if (end) val = 1024<<((end-suffixes)10);
aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	427 return val;
aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	428 }
aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	429
53 41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	430 // Return how long the file at fd is, if there's any way to determine it.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	431 off_t fdlength(int fd)
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	432 {
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	433 off_t bottom = 0, top = 0, pos;
75 89ca591a9236 More random progress on mke2fs. Nothing to see yet. Rob Landley <rob@landley.net> parents: 70 diff changeset	434 int size;
53 41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	435
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	436 // If the ioctl works for this, return it.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	437
75 89ca591a9236 More random progress on mke2fs. Nothing to see yet. Rob Landley <rob@landley.net> parents: 70 diff changeset	438 if (ioctl(fd, BLKGETSIZE, &size) >= 0) return size*512L;
53 41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	439
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	440 // If not, do a binary search for the last location we can read. (Some
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	441 // block devices don't do BLKGETSIZE right.) This should probably have
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	442 // a CONFIG option...
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	443
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	444 do {
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	445 char temp;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	446
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	447 pos = bottom + (top - bottom) / 2;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	448
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	449 // If we can read from the current location, it's bigger.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	450
77 8018c40605d9 The fdlength() ioctl apparently doesn't work on files (and the lseek trick Rob Landley <rob@landley.net> parents: 75 diff changeset	451 if (lseek(fd, pos, 0)>=0 && read(fd, &temp, 1)==1) {
53 41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	452 if (bottom == top) bottom = top = (top+1) * 2;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	453 else bottom = pos;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	454
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	455 // If we can't, it's smaller.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	456
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	457 } else {
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	458 if (bottom == top) {
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	459 if (!top) return 0;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	460 bottom = top/2;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	461 } else top = pos;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	462 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	463 } while (bottom + 1 != top);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	464
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	465 return pos + 1;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	466 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	467
115 19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	468 // This can return null (meaning file not found). It just won't return null
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	469 // for memory allocation reasons.
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	470 char xreadlink(char name)
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	471 {
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	472 int len, size = 0;
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	473 char *buf = 0;
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	474
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	475 // Grow by 64 byte chunks until it's big enough.
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	476 for(;;) {
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	477 size +=64;
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	478 buf = xrealloc(buf, size);
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	479 len = readlink(name, buf, size);
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	480
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	481 if (len<0) {
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	482 free(buf);
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	483 return 0;
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	484 }
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	485 if (len<size) {
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	486 buf[len]=0;
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	487 return buf;
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	488 }
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	489 }
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	490 }
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	491
77 8018c40605d9 The fdlength() ioctl apparently doesn't work on files (and the lseek trick Rob Landley <rob@landley.net> parents: 75 diff changeset	492 /*
8018c40605d9 The fdlength() ioctl apparently doesn't work on files (and the lseek trick Rob Landley <rob@landley.net> parents: 75 diff changeset	493 This might be of use or might not. Unknown yet...
8018c40605d9 The fdlength() ioctl apparently doesn't work on files (and the lseek trick Rob Landley <rob@landley.net> parents: 75 diff changeset	494
53 41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	495 // Read contents of file as a single freshly allocated nul-terminated string.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	496 char readfile(char name)
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	497 {
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	498 off_t len;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	499 int fd;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	500 char *buf;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	501
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	502 fd = open(pidfile, O_RDONLY);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	503 if (fd == -1) return 0;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	504 len = fdlength(fd);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	505 buf = xmalloc(len+1);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	506 buf[xread(fd, buf, len)] = 0;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	507
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	508 return buf;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	509 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	510
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	511 char xreadfile(char name)
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	512 {
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	513 char *buf = readfile(name);
70 a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	514 if (!buf) perror_exit("xreadfile %s", name);
53 41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	515 return buf;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	516 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	517
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	518 */
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	519
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	520 // Open a /var/run/NAME.pid file, dying if we can't write it or if it currently
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	521 // exists and is this executable.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	522 void xpidfile(char *name)
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	523 {
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	524 char pidfile[256], spid[32];
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	525 int i, fd;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	526 pid_t pid;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	527
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	528 sprintf(pidfile, "/var/run/%s.pid", name);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	529 // Try three times to open the sucker.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	530 for (i=0; i<3; i++) {
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	531 fd = open(pidfile, O_CREAT\|O_EXCL, 0644);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	532 if (fd != -1) break;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	533
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	534 // If it already existed, read it. Loop for race condition.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	535 fd = open(pidfile, O_RDONLY);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	536 if (fd == -1) continue;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	537
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	538 // Is the old program still there?
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	539 spid[xread(fd, spid, sizeof(spid)-1)] = 0;
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	540 close(fd);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	541 pid = atoi(spid);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	542 if (fd < 1 \|\| kill(pid, 0) == ESRCH) unlink(pidfile);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	543
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	544 // An else with more sanity checking might be nice here.
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	545 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	546
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	547 if (i == 3) error_exit("xpidfile %s", name);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	548
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	549 xwrite(fd, spid, sprintf(spid, "%ld\n", (long)getpid()));
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	550 close(fd);
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	551 }

Mercurial > hg > toybox

annotate lib/lib.c @ 148:88dd003ccdf4