toybox: lib/lib.c annotate

annotate lib/lib.c @ 707:977e19296b3f

Update readlink so -f works. Add -menq while there.

author	Rob Landley <rob@landley.net>
date	Tue, 20 Nov 2012 09:21:52 -0600
parents	078138791b5c
children	50d759f8b371

rev	line source
250 101a71a76c24 Fix filename in header Charlie Shepherd <masterdriverz@gentoo.org> parents: 245 diff changeset	1 /* lib.c - reusable stuff.
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	2 *
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	3 * 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	4 * 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	5 * 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	6 * wrap.
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	7 *
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	8 * 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	9 */
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 #include "toys.h"
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	12
167 f16c8e5e9435 Replace strlcpy() with xstrcpy(), which exits if the string won't fit. Rob Landley <rob@landley.net> parents: 156 diff changeset	13 // Strcpy with size checking: exit if there's not enough space for the string.
f16c8e5e9435 Replace strlcpy() with xstrcpy(), which exits if the string won't fit. Rob Landley <rob@landley.net> parents: 156 diff changeset	14 void xstrcpy(char dest, char src, size_t size)
124 ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	15 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	16 if (strlen(src)+1 > size) error_exit("xstrcpy");
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	17 strcpy(dest, src);
124 ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	18 }
ef2bc92d5fb0 Work around uClibc weirdness. Rob Landley <rob@landley.net> parents: 115 diff changeset	19
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	20 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	21 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	22 char *s = ": %s";
245 67a0839bda77 Teach perror_exit() to take a NULL argument when we just want "command: error". Rob Landley <rob@landley.net> parents: 234 diff changeset	23
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	24 fprintf(stderr, "%s: ", toys.which->name);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	25 if (msg) vfprintf(stderr, msg, va);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	26 else s+=2;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	27 if (err) fprintf(stderr, s, strerror(err));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	28 putc('\n', stderr);
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	29 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	30
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	31 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	32 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	33 va_list va;
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	34
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	35 va_start(va, msg);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	36 verror_msg(msg, 0, va);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	37 va_end(va);
7 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
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	40 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	41 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	42 va_list va;
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	43
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	44 va_start(va, msg);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	45 verror_msg(msg, errno, va);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	46 va_end(va);
7 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
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	49 // Die with an error message.
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	50 void error_exit(char *msg, ...)
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	51 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	52 va_list va;
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	53
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	54 if (CFG_HELP && toys.exithelp) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	55 toys.optargs=toys.argv;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	56 USE_HELP(help_main();) // dear gcc: shut up.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	57 fprintf(stderr,"\n");
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	58 }
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	59
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	60 va_start(va, msg);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	61 verror_msg(msg, 0, va);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	62 va_end(va);
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	63
696 99ca30ad3d2b Add rebound support to intercept error_exit() and longjmp instead. Rob Landley <rob@landley.net> parents: 694 diff changeset	64 if (!toys.exitval) toys.exitval++;
99ca30ad3d2b Add rebound support to intercept error_exit() and longjmp instead. Rob Landley <rob@landley.net> parents: 694 diff changeset	65 if (toys.rebound) longjmp(*toys.rebound, 1);
99ca30ad3d2b Add rebound support to intercept error_exit() and longjmp instead. Rob Landley <rob@landley.net> parents: 694 diff changeset	66 else exit(toys.exitval);
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	67 }
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	68
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	69
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	70 // 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	71 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	72 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	73 va_list va;
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	74
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	75 va_start(va, msg);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	76 verror_msg(msg, errno, va);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	77 va_end(va);
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	78
696 99ca30ad3d2b Add rebound support to intercept error_exit() and longjmp instead. Rob Landley <rob@landley.net> parents: 694 diff changeset	79 if (!toys.exitval) toys.exitval++;
99ca30ad3d2b Add rebound support to intercept error_exit() and longjmp instead. Rob Landley <rob@landley.net> parents: 694 diff changeset	80 if (toys.rebound) longjmp(*toys.rebound, 1);
99ca30ad3d2b Add rebound support to intercept error_exit() and longjmp instead. Rob Landley <rob@landley.net> parents: 694 diff changeset	81 else exit(toys.exitval);
2 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 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	87 void *ret = malloc(size);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	88 if (!ret) error_exit("xmalloc");
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	89
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 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 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	96 void *ret = xmalloc(size);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	97 memset(ret, 0, size);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	98 return ret;
3 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 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	105 ptr = realloc(ptr, size);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	106 if (!ptr) error_exit("xrealloc");
115 19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	107
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 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.
369 5715eed39575 Correct return types of xstrdup() and xstrndup() Rob Landley <rob@landley.net> parents: 354 diff changeset	112 char xstrndup(char s, size_t n)
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	113 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	114 char *ret = xmalloc(++n);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	115 strncpy(ret, s, n);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	116 ret[--n]=0;
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 153 diff changeset	117
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	118 return ret;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	119 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	120
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	121 // Die unless we can allocate a copy of this string.
369 5715eed39575 Correct return types of xstrdup() and xstrndup() Rob Landley <rob@landley.net> parents: 354 diff changeset	122 char xstrdup(char s)
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	123 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	124 return xstrndup(s, strlen(s));
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	125 }
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	126
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	127 // Die unless we can allocate enough space to sprintf() into.
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	128 char xmsprintf(char format, ...)
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	129 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	130 va_list va, va2;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	131 int len;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	132 char *ret;
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 153 diff changeset	133
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	134 va_start(va, format);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	135 va_copy(va2, va);
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	136
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	137 // How long is it?
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	138 len = vsnprintf(0, 0, format, va);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	139 len++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	140 va_end(va);
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	141
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	142 // Allocate and do the sprintf()
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	143 ret = xmalloc(len);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	144 vsnprintf(ret, len, format, va2);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	145 va_end(va2);
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	146
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	147 return ret;
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	148 }
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	149
70 a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	150 void xprintf(char *format, ...)
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	151 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	152 va_list va;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	153 va_start(va, format);
70 a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	154
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	155 vprintf(format, va);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	156 if (ferror(stdout)) perror_exit("write");
70 a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	157 }
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	158
128 0a90a5fbc1bf Add xputs() to detect EOF on writes. Rob Landley <rob@landley.net> parents: 126 diff changeset	159 void xputs(char *s)
0a90a5fbc1bf Add xputs() to detect EOF on writes. Rob Landley <rob@landley.net> parents: 126 diff changeset	160 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	161 if (EOF == puts(s)) perror_exit("write");
128 0a90a5fbc1bf Add xputs() to detect EOF on writes. Rob Landley <rob@landley.net> parents: 126 diff changeset	162 }
0a90a5fbc1bf Add xputs() to detect EOF on writes. Rob Landley <rob@landley.net> parents: 126 diff changeset	163
70 a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	164 void xputc(char c)
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	165 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	166 if (EOF == fputc(c, stdout) \|\| fflush(stdout)) perror_exit("write");
70 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
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	169 void xflush(void)
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	170 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	171 if (fflush(stdout)) perror_exit("write");;
70 a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	172 }
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	173
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	174 // 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	175 // 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	176 void xexec(char **argv)
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	177 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	178 toy_exec(argv);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	179 execvp(argv[0], argv);
419 af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	180
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	181 perror_exit("exec %s", argv[0]);
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	182 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	183
51 63edd4de94dd Add xaccess() Rob Landley <rob@landley.net> parents: 50 diff changeset	184 void xaccess(char *path, int flags)
63edd4de94dd Add xaccess() Rob Landley <rob@landley.net> parents: 50 diff changeset	185 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	186 if (access(path, flags)) perror_exit("Can't access '%s'", path);
51 63edd4de94dd Add xaccess() Rob Landley <rob@landley.net> parents: 50 diff changeset	187 }
63edd4de94dd Add xaccess() Rob Landley <rob@landley.net> parents: 50 diff changeset	188
214 98820d1eaa79 Upgrade patch to understand creating and deleting files. Rob Landley <rob@landley.net> parents: 209 diff changeset	189 // Die unless we can delete a file. (File must exist to be deleted.)
98820d1eaa79 Upgrade patch to understand creating and deleting files. Rob Landley <rob@landley.net> parents: 209 diff changeset	190 void xunlink(char *path)
98820d1eaa79 Upgrade patch to understand creating and deleting files. Rob Landley <rob@landley.net> parents: 209 diff changeset	191 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	192 if (unlink(path)) perror_exit("unlink '%s'", path);
214 98820d1eaa79 Upgrade patch to understand creating and deleting files. Rob Landley <rob@landley.net> parents: 209 diff changeset	193 }
98820d1eaa79 Upgrade patch to understand creating and deleting files. Rob Landley <rob@landley.net> parents: 209 diff changeset	194
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	195 // 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	196 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	197 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	198 int fd = open(path, flags, mode);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	199 if (fd == -1) perror_exit("%s", path);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	200 return fd;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	201 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	202
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	203 // 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	204 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	205 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	206 return xcreate(path, flags, 0);
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	207 }
bb4c38853a7d xopen() wants 2 arguments unless you're creating a file, in which case you Rob Landley <rob@landley.net> parents: 44 diff changeset	208
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	209 void xclose(int fd)
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	210 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	211 if (close(fd)) perror_exit("xclose");
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	212 }
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	213
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 554 diff changeset	214 int xdup(int fd)
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 554 diff changeset	215 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	216 if (fd != -1) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	217 fd = dup(fd);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	218 if (fd == -1) perror_exit("xdup");
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	219 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	220 return fd;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 554 diff changeset	221 }
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 554 diff changeset	222
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	223 // 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	224 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	225 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	226 FILE *f = fopen(path, mode);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	227 if (!f) perror_exit("No file %s", path);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	228 return f;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	229 }
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	230
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	231 // 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	232 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	233 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	234 size_t count = 0;
309 79a61cd58596 Bug spotted by Roberto Foglietta: at EOF readall() should return count, not len. Rob Landley <rob@landley.net> parents: 308 diff changeset	235
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	236 while (count<len) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	237 int i = read(fd, buf+count, len-count);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	238 if (!i) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	239 if (i<0) return i;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	240 count += i;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	241 }
8 04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	242
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	243 return count;
8 04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	244 }
04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	245
50 63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	246 // 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	247 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	248 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	249 size_t count = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	250 while (count<len) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	251 int i = write(fd, buf+count, len-count);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	252 if (i<1) return i;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	253 count += i;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	254 }
50 63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	255
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	256 return count;
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
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	259 // 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	260 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	261 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	262 ssize_t ret = read(fd, buf, len);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	263 if (ret < 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	264
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	265 return ret;
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	266 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	267
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	268 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	269 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	270 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	271 }
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	272
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	273 // 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	274 // 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	275 // somewhere.
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	276
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	277 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	278 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	279 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	280 }
63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	281
340 6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	282 // Die if lseek fails, probably due to being called on a pipe.
6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	283
6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	284 off_t xlseek(int fd, off_t offset, int whence)
6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	285 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	286 offset = lseek(fd, offset, whence);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	287 if (offset<0) perror_exit("lseek");
340 6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	288
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	289 return offset;
340 6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	290 }
6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	291
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	292 off_t lskip(int fd, off_t offset)
f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	293 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	294 off_t and = lseek(fd, offset, SEEK_CUR);
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	295
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	296 if (and != -1 && offset >= lseek(fd, offset, SEEK_END)
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	297 && offset+and == lseek(fd, offset+and, SEEK_SET)) return 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	298 else {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	299 char buf[4096];
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	300 while (offset>0) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	301 int try = offset>sizeof(buf) ? sizeof(buf) : offset, or;
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	302
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	303 or = readall(fd, buf, try);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	304 if (or < 0) perror_msg("lskip to %lld", (long long)offset);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	305 else offset -= try;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	306 if (or < try) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	307 }
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	308
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	309 return offset;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	310 }
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	311 }
f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	312
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	313 char *xgetcwd(void)
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	314 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	315 char *buf = getcwd(NULL, 0);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	316 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	317
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	318 return buf;
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	319 }
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	320
95 a636e4d20f13 Add xstat(), read_dirtree(), and read_dirtree_node(). Rob Landley <rob@landley.net> parents: 77 diff changeset	321 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	322 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	323 if(stat(path, st)) perror_exit("Can't stat %s", path);
95 a636e4d20f13 Add xstat(), read_dirtree(), and read_dirtree_node(). Rob Landley <rob@landley.net> parents: 77 diff changeset	324 }
a636e4d20f13 Add xstat(), read_dirtree(), and read_dirtree_node(). Rob Landley <rob@landley.net> parents: 77 diff changeset	325
707 977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	326 // Cannonicalize path, even to file with one or more missing components at end
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	327 char xabspath(char path, unsigned missing)
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	328 {
707 977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	329 char apath, temp, *slash;
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	330 int i=0;
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	331
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	332 // If this isn't an absolute path, make it one with cwd.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	333 if (path[0]!='/') {
707 977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	334 char *temp=xgetcwd();
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	335 apath = xmsprintf("%s/%s", temp, path);
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	336 free(temp);
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	337 } else apath = path;
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	338 slash = apath+strlen(apath);
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 153 diff changeset	339
707 977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	340 for (;;) {
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	341 temp = realpath(apath, NULL);
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	342 if (i) *slash = '/';
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	343 if (temp \|\| ++i > missing) break;
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	344 while (slash>apath) if (*--slash == '/') break;
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	345 *slash=0;
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	346 free(temp);
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	347 }
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	348
707 977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	349 if (i && temp) {
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	350 slash = xmsprintf("%s%s", temp, slash);
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	351 free(temp);
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	352 temp = slash;
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	353 }
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	354
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	355 if (path != apath) free(apath);
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	356 return temp;
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	357 }
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	358
585 1dcd7994abea Add xrealpath() at suggestion of Ashish Briggers. Rob Landley <rob@landley.net> parents: 578 diff changeset	359 // Resolve all symlinks, returning malloc() memory.
1dcd7994abea Add xrealpath() at suggestion of Ashish Briggers. Rob Landley <rob@landley.net> parents: 578 diff changeset	360 char xrealpath(char path)
1dcd7994abea Add xrealpath() at suggestion of Ashish Briggers. Rob Landley <rob@landley.net> parents: 578 diff changeset	361 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	362 char *new = realpath(path, NULL);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	363 if (!new) perror_exit("realpath '%s'", path);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	364 return new;
585 1dcd7994abea Add xrealpath() at suggestion of Ashish Briggers. Rob Landley <rob@landley.net> parents: 578 diff changeset	365 }
1dcd7994abea Add xrealpath() at suggestion of Ashish Briggers. Rob Landley <rob@landley.net> parents: 578 diff changeset	366
292 b4077be6c746 Update mdev to work around the newest sysfs api breakage in the 2.6.25 kernel. Rob Landley <rob@landley.net> parents: 284 diff changeset	367 void xchdir(char *path)
b4077be6c746 Update mdev to work around the newest sysfs api breakage in the 2.6.25 kernel. Rob Landley <rob@landley.net> parents: 284 diff changeset	368 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	369 if (chdir(path)) error_exit("chdir '%s'", path);
292 b4077be6c746 Update mdev to work around the newest sysfs api breakage in the 2.6.25 kernel. Rob Landley <rob@landley.net> parents: 284 diff changeset	370 }
b4077be6c746 Update mdev to work around the newest sysfs api breakage in the 2.6.25 kernel. Rob Landley <rob@landley.net> parents: 284 diff changeset	371
216 5697a3f7c8cf Make patch's file add actually work, including directory creating and Rob Landley <rob@landley.net> parents: 214 diff changeset	372 // Ensure entire path exists.
5697a3f7c8cf Make patch's file add actually work, including directory creating and Rob Landley <rob@landley.net> parents: 214 diff changeset	373 // If mode != -1 set permissions on newly created dirs.
5697a3f7c8cf Make patch's file add actually work, including directory creating and Rob Landley <rob@landley.net> parents: 214 diff changeset	374 // Requires that path string be writable (for temporary null terminators).
5697a3f7c8cf Make patch's file add actually work, including directory creating and Rob Landley <rob@landley.net> parents: 214 diff changeset	375 void xmkpath(char *path, int mode)
5697a3f7c8cf Make patch's file add actually work, including directory creating and Rob Landley <rob@landley.net> parents: 214 diff changeset	376 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	377 char *p, old;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	378 mode_t mask;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	379 int rc;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	380 struct stat st;
216 5697a3f7c8cf Make patch's file add actually work, including directory creating and Rob Landley <rob@landley.net> parents: 214 diff changeset	381
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	382 for (p = path; ; p++) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	383 if (!p \|\| p == '/') {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	384 old = *p;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	385 *p = rc = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	386 if (stat(path, &st) \|\| !S_ISDIR(st.st_mode)) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	387 if (mode != -1) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	388 mask=umask(0);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	389 rc = mkdir(path, mode);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	390 umask(mask);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	391 } else rc = mkdir(path, 0777);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	392 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	393 *p = old;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	394 if(rc) perror_exit("mkpath '%s'", path);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	395 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	396 if (!*p) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	397 }
216 5697a3f7c8cf Make patch's file add actually work, including directory creating and Rob Landley <rob@landley.net> parents: 214 diff changeset	398 }
370 c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	399
c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	400 // setuid() can fail (for example, too many processes belonging to that user),
c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	401 // which opens a security hole if the process continues as the original user.
c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	402
c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	403 void xsetuid(uid_t uid)
c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	404 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	405 if (setuid(uid)) perror_exit("xsetuid");
370 c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	406 }
c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	407
c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	408
20 3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	409 // 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	410 // 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	411 // order.
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	412
20 3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	413 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	414 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	415 struct string_list rlist = NULL, *prlist=&rlist;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	416 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	417
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	418 for (;;) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	419 char *next = path ? strchr(path, ':') : NULL;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	420 int len = next ? next-path : strlen(path);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	421 struct string_list *rnext;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	422 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	423
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	424 rnext = xmalloc(sizeof(void *) + strlen(filename)
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	425 + (len ? len : strlen(cwd)) + 2);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	426 if (!len) sprintf(rnext->str, "%s/%s", cwd, filename);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	427 else {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	428 char *res = rnext->str;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	429 strncpy(res, path, len);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	430 res += len;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	431 *(res++) = '/';
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	432 strcpy(res, filename);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	433 }
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	434
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	435 // Confirm it's not a directory.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	436 if (!stat(rnext->str, &st) && S_ISREG(st.st_mode)) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	437 *prlist = rnext;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	438 rnext->next = NULL;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	439 prlist = &(rnext->next);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	440 } 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	441
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	442 if (!next) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	443 path += len;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	444 path++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	445 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	446 free(cwd);
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	447
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	448 return rlist;
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	449 }
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	450
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	451 // 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	452 // 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	453 // 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	454 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	455 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	456 int i, out = 0;
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	457
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	458 if (buflen) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	459 for (i=1000000000; i; i/=10) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	460 int res = n/i;
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	461
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	462 if ((res \|\| out \|\| i == 1) && --buflen>0) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	463 out++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	464 n -= res*i;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	465 *buf++ = '0' + res;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	466 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	467 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	468 *buf = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	469 }
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	470 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	471
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	472 // 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	473 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	474 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	475 if (buflen && n<0) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	476 n = -n;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	477 *buf++ = '-';
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	478 buflen--;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	479 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	480 utoa_to_buf((unsigned)n, buf, buflen);
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	481 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	482
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	483 // 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	484 // 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	485 //
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	486 // 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	487 // 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	488 // 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	489
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	490 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	491
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	492 // 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	493 char *utoa(unsigned n)
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	494 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	495 utoa_to_buf(n, itoa_buf, sizeof(itoa_buf));
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	496
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	497 return itoa_buf;
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	498 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	499
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	500 char *itoa(int n)
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	501 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	502 itoa_to_buf(n, itoa_buf, sizeof(itoa_buf));
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	503
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	504 return itoa_buf;
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	505 }
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	506
102 aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	507 // 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	508 // (zetta and yotta don't fit in 64 bits.)
443 41b5ac08208f Make atolx() error_exit() if fed a string that doesn't convert entirely into an integer. Rob Landley <rob@landley.net> parents: 419 diff changeset	509 long atolx(char *numstr)
102 aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	510 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	511 char c, suffixes="bkmgtpe", *end;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	512 long val = strtol(numstr, &c, 0);
102 aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	513
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	514 if (*c) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	515 if (c != numstr && (end = strchr(suffixes, tolower(*c)))) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	516 int shift = end-suffixes;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	517 if (shift--) val = 1024L<<(shift10);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	518 } else {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	519 while (isspace(*c)) c++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	520 if (*c) error_exit("not integer: %s", numstr);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	521 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	522 }
397 b7afbc6b753a Forgot to check in loopfiles_rw changes needed by truncate. Rob Landley <rob@landley.net> parents: 379 diff changeset	523
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	524 return val;
102 aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	525 }
aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	526
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 554 diff changeset	527 int numlen(long l)
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 554 diff changeset	528 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	529 int len = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	530 while (l) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	531 l /= 10;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	532 len++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	533 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	534 return len;
565 44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 554 diff changeset	535 }
44abf4d901f3 Rewrite dirtree so we don't need readdir, scandir, and fts.h. Rewrite ls (from scratch) to use new dirtree infrastructure. (This breaks everything else that currently uses dirtree.) Rob Landley <rob@landley.net> parents: 554 diff changeset	536
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	537 int stridx(char *haystack, char needle)
f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	538 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	539 char *off;
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	540
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	541 if (!needle) return -1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	542 off = strchr(haystack, needle);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	543 if (!off) return -1;
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	544
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	545 return off-haystack;
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	546 }
f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	547
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	548 // 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	549 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	550 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	551 off_t bottom = 0, top = 0, pos, old;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	552 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	553
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	554 // If the ioctl works for this, return it.
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	555
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	556 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	557
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	558 // If not, do a binary search for the last location we can read. (Some
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	559 // block devices don't do BLKGETSIZE right.) This should probably have
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	560 // a CONFIG option...
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	561
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	562 old = lseek(fd, 0, SEEK_CUR);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	563 do {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	564 char temp;
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	565
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	566 pos = bottom + (top - bottom) / 2;
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	567
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	568 // If we can read from the current location, it's bigger.
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	569
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	570 if (lseek(fd, pos, 0)>=0 && read(fd, &temp, 1)==1) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	571 if (bottom == top) bottom = top = (top+1) * 2;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	572 else bottom = pos;
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	573
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	574 // If we can't, it's smaller.
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	575
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	576 } else {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	577 if (bottom == top) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	578 if (!top) return 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	579 bottom = top/2;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	580 } else top = pos;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	581 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	582 } while (bottom + 1 != top);
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	583
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	584 lseek(fd, old, SEEK_SET);
310 8b8116214b1c Roberto Foglietta pointed out that readall() needs fdlength() to restore Rob Landley <rob@landley.net> parents: 309 diff changeset	585
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	586 return pos + 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	587 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	588
115 19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	589 // 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	590 // 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	591 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	592 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	593 int len, size = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	594 char *buf = 0;
115 19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	595
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	596 // Grow by 64 byte chunks until it's big enough.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	597 for(;;) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	598 size +=64;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	599 buf = xrealloc(buf, size);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	600 len = readlink(name, buf, size);
115 19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	601
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	602 if (len<0) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	603 free(buf);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	604 return 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	605 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	606 if (len<size) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	607 buf[len]=0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	608 return buf;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	609 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	610 }
115 19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	611 }
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	612
77 8018c40605d9 The fdlength() ioctl apparently doesn't work on files (and the lseek trick Rob Landley <rob@landley.net> parents: 75 diff changeset	613 /*
8018c40605d9 The fdlength() ioctl apparently doesn't work on files (and the lseek trick Rob Landley <rob@landley.net> parents: 75 diff changeset	614 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	615
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	616 // 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	617 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	618 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	619 off_t len;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	620 int fd;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	621 char *buf;
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	622
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	623 fd = open(name, O_RDONLY);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	624 if (fd == -1) return 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	625 len = fdlength(fd);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	626 buf = xmalloc(len+1);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	627 buf[readall(fd, buf, len)] = 0;
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	628
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	629 return buf;
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	630 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	631
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	632 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	633 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	634 char *buf = readfile(name);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	635 if (!buf) perror_exit("xreadfile %s", name);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	636 return buf;
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	637 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	638
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	639 */
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	640
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	641 // 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	642 // 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	643 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	644 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	645 char pidfile[256], spid[32];
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	646 int i, fd;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	647 pid_t pid;
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	648
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	649 sprintf(pidfile, "/var/run/%s.pid", name);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	650 // Try three times to open the sucker.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	651 for (i=0; i<3; i++) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	652 fd = open(pidfile, O_CREAT\|O_EXCL, 0644);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	653 if (fd != -1) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	654
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	655 // If it already existed, read it. Loop for race condition.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	656 fd = open(pidfile, O_RDONLY);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	657 if (fd == -1) continue;
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	658
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	659 // Is the old program still there?
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	660 spid[xread(fd, spid, sizeof(spid)-1)] = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	661 close(fd);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	662 pid = atoi(spid);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	663 if (pid < 1 \|\| kill(pid, 0) == ESRCH) unlink(pidfile);
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	664
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	665 // An else with more sanity checking might be nice here.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	666 }
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 153 diff changeset	667
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	668 if (i == 3) error_exit("xpidfile %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	669
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	670 xwrite(fd, spid, sprintf(spid, "%ld\n", (long)getpid()));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	671 close(fd);
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	672 }
185 29e2051296fd Add loopfiles() function, make catv use it. Rob Landley <rob@landley.net> parents: 167 diff changeset	673
308 52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	674 // Iterate through an array of files, opening each one and calling a function
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	675 // on that filehandle and name. The special filename "-" means stdin if
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	676 // flags is O_RDONLY, stdout otherwise. An empty argument list calls
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	677 // function() on just stdin/stdout.
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	678 //
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	679 // Note: read only filehandles are automatically closed when function()
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	680 // returns, but writeable filehandles must be close by function()
397 b7afbc6b753a Forgot to check in loopfiles_rw changes needed by truncate. Rob Landley <rob@landley.net> parents: 379 diff changeset	681 void loopfiles_rw(char **argv, int flags, int permissions, int failok,
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	682 void (function)(int fd, char name))
185 29e2051296fd Add loopfiles() function, make catv use it. Rob Landley <rob@landley.net> parents: 167 diff changeset	683 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	684 int fd;
185 29e2051296fd Add loopfiles() function, make catv use it. Rob Landley <rob@landley.net> parents: 167 diff changeset	685
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	686 // If no arguments, read from stdin.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	687 if (!*argv) function(flags ? 1 : 0, "-");
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	688 else do {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	689 // Filename "-" means read from stdin.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	690 // Inability to open a file prints a warning, but doesn't exit.
185 29e2051296fd Add loopfiles() function, make catv use it. Rob Landley <rob@landley.net> parents: 167 diff changeset	691
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	692 if (!strcmp(*argv,"-")) fd=0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	693 else if (0>(fd = open(*argv, flags, permissions)) && !failok) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	694 perror_msg("%s", *argv);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	695 toys.exitval = 1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	696 continue;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	697 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	698 function(fd, *argv);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	699 if (flags == O_RDONLY) close(fd);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	700 } while (*++argv);
185 29e2051296fd Add loopfiles() function, make catv use it. Rob Landley <rob@landley.net> parents: 167 diff changeset	701 }
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	702
397 b7afbc6b753a Forgot to check in loopfiles_rw changes needed by truncate. Rob Landley <rob@landley.net> parents: 379 diff changeset	703 // Call loopfiles_rw with O_RDONLY and !failok (common case).
308 52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	704 void loopfiles(char *argv, void (function)(int fd, char *name))
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	705 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	706 loopfiles_rw(argv, O_RDONLY, 0, 0, function);
308 52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	707 }
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	708
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	709 // Slow, but small.
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	710
284 603275a05524 Teach get_rawline() to continue until a configurable char, and xstrndup() Rob Landley <rob@landley.net> parents: 252 diff changeset	711 char get_rawline(int fd, long plen, char end)
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	712 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	713 char c, *buf = NULL;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	714 long len = 0;
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	715
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	716 for (;;) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	717 if (1>read(fd, &c, 1)) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	718 if (!(len & 63)) buf=xrealloc(buf, len+65);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	719 if ((buf[len++]=c) == end) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	720 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	721 if (buf) buf[len]=0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	722 if (plen) *plen = len;
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	723
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	724 return buf;
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	725 }
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	726
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	727 char *get_line(int fd)
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	728 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	729 long len;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	730 char *buf = get_rawline(fd, &len, '\n');
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	731
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	732 if (buf && buf[--len]=='\n') buf[len]=0;
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	733
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	734 return buf;
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	735 }
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	736
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	737 // Copy the rest of in to out and close both files.
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	738
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	739 void xsendfile(int in, int out)
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	740 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	741 long len;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	742 char buf[4096];
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	743
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	744 if (in<0) return;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	745 for (;;) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	746 len = xread(in, buf, 4096);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	747 if (len<1) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	748 xwrite(out, buf, len);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	749 }
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	750 }
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	751
590 7becb497c3c4 Update chmod to work with new dirtree, and fix bugs in string_to_mode(). Rob Landley <rob@landley.net> parents: 585 diff changeset	752 int wfchmodat(int fd, char *name, mode_t mode)
7becb497c3c4 Update chmod to work with new dirtree, and fix bugs in string_to_mode(). Rob Landley <rob@landley.net> parents: 585 diff changeset	753 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	754 int rc = fchmodat(fd, name, mode, 0);
590 7becb497c3c4 Update chmod to work with new dirtree, and fix bugs in string_to_mode(). Rob Landley <rob@landley.net> parents: 585 diff changeset	755
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	756 if (rc) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	757 perror_msg("chmod '%s' to %04o", name, mode);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	758 toys.exitval=1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	759 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	760 return rc;
590 7becb497c3c4 Update chmod to work with new dirtree, and fix bugs in string_to_mode(). Rob Landley <rob@landley.net> parents: 585 diff changeset	761 }
7becb497c3c4 Update chmod to work with new dirtree, and fix bugs in string_to_mode(). Rob Landley <rob@landley.net> parents: 585 diff changeset	762
643 7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	763 static char *tempfile2zap;
7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	764 static void tempfile_handler(int i)
7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	765 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	766 if (1 < (long)tempfile2zap) unlink(tempfile2zap);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	767 _exit(1);
643 7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	768 }
7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	769
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	770 // Open a temporary file to copy an existing file into.
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	771 int copy_tempfile(int fdin, char name, char *tempname)
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	772 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	773 struct stat statbuf;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	774 int fd;
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	775
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	776 *tempname = xstrndup(name, strlen(name)+6);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	777 strcat(*tempname,"XXXXXX");
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	778 if(-1 == (fd = mkstemp(*tempname))) error_exit("no temp file");
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	779 if (!tempfile2zap) sigatexit(tempfile_handler);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	780 tempfile2zap = *tempname;
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	781
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	782 // Set permissions of output file
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	783
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	784 fstat(fdin, &statbuf);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	785 fchmod(fd, statbuf.st_mode);
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	786
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	787 return fd;
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	788 }
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	789
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	790 // Abort the copy and delete the temporary file.
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	791 void delete_tempfile(int fdin, int fdout, char **tempname)
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	792 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	793 close(fdin);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	794 close(fdout);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	795 unlink(*tempname);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	796 tempfile2zap = (char *)1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	797 free(*tempname);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	798 *tempname = NULL;
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	799 }
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	800
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	801 // Copy the rest of the data and replace the original with the copy.
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	802 void replace_tempfile(int fdin, int fdout, char **tempname)
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	803 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	804 char temp = xstrdup(tempname);
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	805
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	806 temp[strlen(temp)-6]=0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	807 if (fdin != -1) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	808 xsendfile(fdin, fdout);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	809 xclose(fdin);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	810 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	811 xclose(fdout);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	812 rename(*tempname, temp);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	813 tempfile2zap = (char *)1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	814 free(*tempname);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	815 free(temp);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	816 *tempname = NULL;
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	817 }
334 83c461db9df7 Check in crc_init needed by cksum. (Oops.) Rob Landley <rob@landley.net> parents: 311 diff changeset	818
83c461db9df7 Check in crc_init needed by cksum. (Oops.) Rob Landley <rob@landley.net> parents: 311 diff changeset	819 // Create a 256 entry CRC32 lookup table.
83c461db9df7 Check in crc_init needed by cksum. (Oops.) Rob Landley <rob@landley.net> parents: 311 diff changeset	820
337 aaafa1ceaa91 Add -N, -I, -L, and -P options to cksum. Rob Landley <rob@landley.net> parents: 334 diff changeset	821 void crc_init(unsigned int *crc_table, int little_endian)
334 83c461db9df7 Check in crc_init needed by cksum. (Oops.) Rob Landley <rob@landley.net> parents: 311 diff changeset	822 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	823 unsigned int i;
334 83c461db9df7 Check in crc_init needed by cksum. (Oops.) Rob Landley <rob@landley.net> parents: 311 diff changeset	824
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	825 // Init the CRC32 table (big endian)
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	826 for (i=0; i<256; i++) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	827 unsigned int j, c = little_endian ? i : i<<24;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	828 for (j=8; j; j--)
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	829 if (little_endian) c = (c&1) ? (c>>1)^0xEDB88320 : c>>1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	830 else c=c&0x80000000 ? (c<<1)^0x04c11db7 : (c<<1);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	831 crc_table[i] = c;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	832 }
334 83c461db9df7 Check in crc_init needed by cksum. (Oops.) Rob Landley <rob@landley.net> parents: 311 diff changeset	833 }
419 af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	834
af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	835 // Quick and dirty query size of terminal, doesn't do ANSI probe fallback.
af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	836 // set x=0 and y=0 before calling to detect failure to set either, or
af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	837 // x=80 y=25 to provide defaults
af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	838
af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	839 void terminal_size(unsigned x, unsigned y)
af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	840 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	841 struct winsize ws;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	842 int i;
419 af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	843
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	844 //memset(&ws, 0, sizeof(ws));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	845 for (i=0; i<3; i++) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	846 if (ioctl(i, TIOCGWINSZ, &ws)) continue;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	847 if (x) *x = ws.ws_col;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	848 if (y) *y = ws.ws_row;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	849 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	850 if (x) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	851 char *s = getenv("COLUMNS");
419 af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	852
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	853 i = s ? atoi(s) : 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	854 if (i>0) *x = i;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	855 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	856 if (y) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	857 char *s = getenv("ROWS");
419 af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	858
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	859 i = s ? atoi(s) : 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	860 if (i>0) *y = i;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	861 }
419 af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	862 }
af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	863
af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	864 // This should use a raw tty, fixit later.
503 3b9dea897dc0 Upgrade yesno() and make cp -i use it. Rob Landley <rob@landley.net> parents: 498 diff changeset	865 int yesno(char *prompt, int def)
419 af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	866 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	867 FILE *fps[] = {stdin, stdout, stderr};
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	868 int i;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	869 char buf;
419 af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	870
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	871 for (i=0; i<3; i++) if (isatty(i)) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	872 if (i == 3) return 1;
419 af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	873
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	874 fprintf(fps[i], "%s (%c/%c):", prompt, def ? 'Y' : 'y', def ? 'n' : 'N');
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	875 fflush(fps[i]);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	876 while (fread(&buf, 1, 1, fps[i])) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	877 if (tolower(buf) == 'y') def = 1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	878 if (tolower(buf) == 'n') def = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	879 else if (!isspace(buf)) continue;
550 b2194045c40e Remove "feature test macros", replace non-portable fdprintf() with standard fprintf(). Rob Landley <rob@landley.net> parents: 535 diff changeset	880
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	881 break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	882 }
550 b2194045c40e Remove "feature test macros", replace non-portable fdprintf() with standard fprintf(). Rob Landley <rob@landley.net> parents: 535 diff changeset	883
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	884 return def;
419 af0cca0aba9d Quick and dirty terminal_size() and yesno() functions, both of which need to be improved. Rob Landley <rob@landley.net> parents: 399 diff changeset	885 }
475 1fb149e75ebf Add killall by Andreas Heck, and factor out common pid code to lib.h. Rob Landley <rob@landley.net> parents: 443 diff changeset	886
1fb149e75ebf Add killall by Andreas Heck, and factor out common pid code to lib.h. Rob Landley <rob@landley.net> parents: 443 diff changeset	887 // Execute a callback for each PID that matches a process name from a list.
477 f0b07ce5f125 Cleanups to pidof (including some global infrastructure shared with killall). Rob Landley <rob@landley.net> parents: 475 diff changeset	888 void for_each_pid_with_name_in(char *names, void (callback)(pid_t pid))
f0b07ce5f125 Cleanups to pidof (including some global infrastructure shared with killall). Rob Landley <rob@landley.net> parents: 475 diff changeset	889 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	890 DIR *dp;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	891 struct dirent *entry;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	892 char cmd[sizeof(toybuf)], path[64];
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	893 char **curname;
475 1fb149e75ebf Add killall by Andreas Heck, and factor out common pid code to lib.h. Rob Landley <rob@landley.net> parents: 443 diff changeset	894
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	895 if (!(dp = opendir("/proc"))) perror_exit("opendir");
475 1fb149e75ebf Add killall by Andreas Heck, and factor out common pid code to lib.h. Rob Landley <rob@landley.net> parents: 443 diff changeset	896
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	897 while ((entry = readdir(dp))) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	898 int fd, n;
475 1fb149e75ebf Add killall by Andreas Heck, and factor out common pid code to lib.h. Rob Landley <rob@landley.net> parents: 443 diff changeset	899
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	900 if (!isdigit(*entry->d_name)) continue;
475 1fb149e75ebf Add killall by Andreas Heck, and factor out common pid code to lib.h. Rob Landley <rob@landley.net> parents: 443 diff changeset	901
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	902 if (sizeof(path) <= snprintf(path, sizeof(path), "/proc/%s/cmdline",
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	903 entry->d_name)) continue;
475 1fb149e75ebf Add killall by Andreas Heck, and factor out common pid code to lib.h. Rob Landley <rob@landley.net> parents: 443 diff changeset	904
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	905 if (-1 == (fd=open(path, O_RDONLY))) continue;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	906 n = read(fd, cmd, sizeof(cmd));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	907 close(fd);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	908 if (n<1) continue;
475 1fb149e75ebf Add killall by Andreas Heck, and factor out common pid code to lib.h. Rob Landley <rob@landley.net> parents: 443 diff changeset	909
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	910 for (curname = names; *curname; curname++)
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	911 if (!strcmp(basename(cmd), *curname)) callback(atol(entry->d_name));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	912 }
475 1fb149e75ebf Add killall by Andreas Heck, and factor out common pid code to lib.h. Rob Landley <rob@landley.net> parents: 443 diff changeset	913
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	914 closedir(dp);
475 1fb149e75ebf Add killall by Andreas Heck, and factor out common pid code to lib.h. Rob Landley <rob@landley.net> parents: 443 diff changeset	915 }
498 c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	916
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	917 struct signame {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	918 int num;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	919 char *name;
498 c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	920 };
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	921
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	922 // Signals required by POSIX 2008:
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	923 // http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/signal.h.html
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	924
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	925 #define SIGNIFY(x) {SIG##x, #x}
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	926
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	927 static struct signame signames[] = {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	928 SIGNIFY(ABRT), SIGNIFY(ALRM), SIGNIFY(BUS),
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	929 SIGNIFY(FPE), SIGNIFY(HUP), SIGNIFY(ILL), SIGNIFY(INT), SIGNIFY(KILL),
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	930 SIGNIFY(PIPE), SIGNIFY(QUIT), SIGNIFY(SEGV), SIGNIFY(TERM),
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	931 SIGNIFY(USR1), SIGNIFY(USR2), SIGNIFY(SYS), SIGNIFY(TRAP),
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	932 SIGNIFY(VTALRM), SIGNIFY(XCPU), SIGNIFY(XFSZ),
643 7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	933
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	934 // Start of non-terminal signals
643 7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	935
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	936 SIGNIFY(CHLD), SIGNIFY(CONT), SIGNIFY(STOP), SIGNIFY(TSTP),
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	937 SIGNIFY(TTIN), SIGNIFY(TTOU), SIGNIFY(URG)
498 c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	938 };
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	939
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	940 // not in posix: SIGNIFY(STKFLT), SIGNIFY(WINCH), SIGNIFY(IO), SIGNIFY(PWR)
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	941 // obsolete: SIGNIFY(PROF) SIGNIFY(POLL)
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	942
643 7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	943 // Install the same handler on every signal that defaults to killing the process
7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	944 void sigatexit(void *handler)
7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	945 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	946 int i;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	947 for (i=0; signames[i].num != SIGCHLD; i++) signal(signames[i].num, handler);
643 7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	948 }
498 c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	949 // Convert name to signal number. If name == NULL print names.
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	950 int sig_to_num(char *pidstr)
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	951 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	952 int i;
498 c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	953
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	954 if (pidstr) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	955 char *s;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	956 i = strtol(pidstr, &s, 10);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	957 if (!*s) return i;
498 c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	958
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	959 if (!strncasecmp(pidstr, "sig", 3)) pidstr+=3;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	960 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	961 for (i = 0; i < sizeof(signames)/sizeof(struct signame); i++)
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	962 if (!pidstr) xputs(signames[i].name);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	963 else if (!strcasecmp(pidstr, signames[i].name)) return signames[i].num;
498 c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	964
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	965 return -1;
498 c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	966 }
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	967
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	968 char *num_to_sig(int sig)
c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	969 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	970 int i;
498 c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	971
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	972 for (i=0; i<sizeof(signames)/sizeof(struct signame); i++)
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	973 if (signames[i].num == sig) return signames[i].name;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	974 return NULL;
498 c9aaceccd6bd Factor out common code between killall/kill and move it to lib/lib.c, plus cleanups on kill.c. Rob Landley <rob@landley.net> parents: 480 diff changeset	975 }
551 2548e6e590b2 Add string to mode_t parser Daniel Walter <d.walter@0x90.at> parents: 550 diff changeset	976
643 7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	977 // premute mode bits based on posix mode strings.
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	978 mode_t string_to_mode(char *modestr, mode_t mode)
551 2548e6e590b2 Add string to mode_t parser Daniel Walter <d.walter@0x90.at> parents: 550 diff changeset	979 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	980 char whos = "ogua", hows = "=+-", whats = "xwrstX", whys = "ogu";
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	981 char s, str = modestr;
553 75da5d793fc8 Unwind gratuitous macros. Rob Landley <rob@landley.net> parents: 551 diff changeset	982
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	983 // Handle octal mode
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	984 if (isdigit(*str)) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	985 mode = strtol(str, &s, 8);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	986 if (*s \|\| (mode & ~(07777))) goto barf;
553 75da5d793fc8 Unwind gratuitous macros. Rob Landley <rob@landley.net> parents: 551 diff changeset	987
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	988 return mode;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	989 }
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	990
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	991 // Gaze into the bin of permission...
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	992 for (;;) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	993 int i, j, dowho, dohow, dowhat, amask;
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	994
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	995 dowho = dohow = dowhat = amask = 0;
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	996
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	997 // Find the who, how, and what stanzas, in that order
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	998 while (str && (s = strchr(whos, str))) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	999 dowho \|= 1<<(s-whos);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1000 str++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1001 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1002 // If who isn't specified, like "a" but honoring umask.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1003 if (!dowho) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1004 dowho = 8;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1005 umask(amask=umask(0));
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1006 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1007 if (!str \|\| !(s = strchr(hows, str))) goto barf;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1008 dohow = *(str++);
590 7becb497c3c4 Update chmod to work with new dirtree, and fix bugs in string_to_mode(). Rob Landley <rob@landley.net> parents: 585 diff changeset	1009
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1010 if (!dohow) goto barf;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1011 while (str && (s = strchr(whats, str))) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1012 dowhat \|= 1<<(s-whats);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1013 str++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1014 }
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1015
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1016 // Convert X to x for directory or if already executable somewhere
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1017 if ((dowhat&32) && (S_ISDIR(mode) \|\| (mode&0111))) dowhat \|= 1;
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1018
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1019 // Copy mode from another category?
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1020 if (!dowhat && str && (s = strchr(whys, str))) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1021 dowhat = (mode>>(3*(s-whys)))&7;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1022 str++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1023 }
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1024
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1025 // Are we ready to do a thing yet?
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1026 if (str && (str++) != ',') goto barf;
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1027
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1028 // Ok, apply the bits to the mode.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1029 for (i=0; i<4; i++) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1030 for (j=0; j<3; j++) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1031 mode_t bit = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1032 int where = 1<<((3*i)+j);
638 92200901cfe1 Make chmod +w respect umask, implement +s and +t, fix ls to show suid/sgid/stid without x bit. Rob Landley <rob@landley.net> parents: 623 diff changeset	1033
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1034 if (amask & where) continue;
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1035
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1036 // Figure out new value at this location
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1037 if (i == 3) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1038 // suid/sticky bit.
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1039 if (j) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1040 if ((dowhat & 8) && (dowho&(8\|(1<<i)))) bit++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1041 } else if (dowhat & 16) bit++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1042 } else {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1043 if (!(dowho&(8\|(1<<i)))) continue;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1044 if (dowhat&(1<<j)) bit++;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1045 }
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1046
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1047 // When selection active, modify bit
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1048
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1049 if (dohow == '=' \|\| (bit && dohow == '-')) mode &= ~where;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1050 if (bit && dohow != '-') mode \|= where;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1051 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1052 }
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1053
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1054 if (!*str) break;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1055 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1056 return mode;
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1057 barf:
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1058 error_exit("bad mode '%s'", modestr);
551 2548e6e590b2 Add string to mode_t parser Daniel Walter <d.walter@0x90.at> parents: 550 diff changeset	1059 }
658 2b957eaa00c7 Add du command. Ashwini Kumar <ak.ashwini@gmail.com> parents: 643 diff changeset	1060
2b957eaa00c7 Add du command. Ashwini Kumar <ak.ashwini@gmail.com> parents: 643 diff changeset	1061
2b957eaa00c7 Add du command. Ashwini Kumar <ak.ashwini@gmail.com> parents: 643 diff changeset	1062 char* make_human_readable(unsigned long long size, unsigned long unit)
2b957eaa00c7 Add du command. Ashwini Kumar <ak.ashwini@gmail.com> parents: 643 diff changeset	1063 {
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1064 unsigned int frac = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1065 if(unit) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1066 size = (size/(unit)) + (size%(unit)?1:0);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1067 return xmsprintf("%llu", size);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1068 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1069 else {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1070 static char units[] = {'\0', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'};
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1071 int index = 0;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1072 while(size >= 1024) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1073 frac = size%1024;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1074 size /= 1024;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1075 index++;
658 2b957eaa00c7 Add du command. Ashwini Kumar <ak.ashwini@gmail.com> parents: 643 diff changeset	1076 }
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1077 frac = (frac/102) + ((frac%102)?1:0);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1078 if(frac >= 10) {
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1079 size += 1;
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1080 frac = 0;
658 2b957eaa00c7 Add du command. Ashwini Kumar <ak.ashwini@gmail.com> parents: 643 diff changeset	1081 }
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1082 if(frac) return xmsprintf("%llu.%u%c", size, frac, units[index]);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1083 else return xmsprintf("%llu%c", size, units[index]);
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1084 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1085 return NULL; //not reached
658 2b957eaa00c7 Add du command. Ashwini Kumar <ak.ashwini@gmail.com> parents: 643 diff changeset	1086 }
698 078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1087
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1088 /*
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1089 * used to get the interger value.
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1090 */
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1091 unsigned long get_int_value(const char *numstr, unsigned lowrange, unsigned highrange)
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1092 {
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1093 unsigned long rvalue = 0;
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1094 char *ptr;
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1095 if(numstr == '-' \|\| numstr == '+' \|\| isspace(*numstr)) perror_exit("invalid number '%s'", numstr);
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1096 errno = 0;
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1097 rvalue = strtoul(numstr, &ptr, 10);
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1098 if(errno \|\| numstr == ptr) perror_exit("invalid number '%s'", numstr);
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1099 if(*ptr) perror_exit("invalid number '%s'", numstr);
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1100 if(rvalue >= lowrange && rvalue <= highrange) return rvalue;
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1101 else {
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1102 perror_exit("invalid number '%s'", numstr);
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1103 return rvalue; //Not reachable; to avoid waring message.
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1104 }
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1105 }

Mercurial > hg > toybox

annotate lib/lib.c @ 707:977e19296b3f