toybox: lib/lib.c annotate

annotate lib/lib.c @ 780:6cc69be43c42

Have error_msg() and friends set TT.exitval to 1 if it's still 0, clean out other places that were setting it that no longer need to.

author	Rob Landley <rob@landley.net>
date	Wed, 02 Jan 2013 02:00:35 -0600
parents	f169d9708518
children	126cd3b8015c

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);
780 6cc69be43c42 Have error_msg() and friends set TT.exitval to 1 if it's still 0, clean out other places that were setting it that no longer need to. Rob Landley <rob@landley.net> parents: 762 diff changeset	29 if (!toys.exitval) toys.exitval++;
7 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
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	32 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	33 {
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	34 va_list va;
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	35
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	36 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	37 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	38 va_end(va);
7 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
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	41 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	42 {
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	43 va_list va;
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	44
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	45 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	46 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	47 va_end(va);
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	48 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	49
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	50 // Die with an error message.
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	51 void error_exit(char *msg, ...)
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	52 {
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	53 va_list va;
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	54
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	55 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	56 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	57 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	58 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	59 }
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	60
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	61 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	62 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	63 va_end(va);
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	64
696 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.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	80 else exit(toys.exitval);
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	81 }
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 // 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	84 void *xmalloc(size_t size)
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	85 {
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	86 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	87 if (!ret) error_exit("xmalloc");
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	88
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	89 return ret;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	90 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	91
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	92 // Die unless we can allocate prezeroed memory.
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	93 void *xzalloc(size_t size)
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	94 {
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	95 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	96 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	97 return ret;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	98 }
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 // 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	101 // 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	102 void xrealloc(void ptr, size_t size)
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	103 {
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	104 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	105 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	106
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	107 return ptr;
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	108 }
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	109
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	110 // 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	111 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	112 {
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	113 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	114 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	115 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	116
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	117 return ret;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	118 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	119
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	120 // Die unless we can allocate a copy of this string.
369 5715eed39575 Correct return types of xstrdup() and xstrndup() Rob Landley <rob@landley.net> parents: 354 diff changeset	121 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	122 {
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	123 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	124 }
dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	125
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	126 // Die unless we can allocate enough space to sprintf() into.
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	127 char xmsprintf(char format, ...)
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	128 {
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	129 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	130 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	131 char *ret;
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 153 diff changeset	132
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	133 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	134 va_copy(va2, va);
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	135
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	136 // 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	137 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	138 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	139 va_end(va);
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	140
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	141 // 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	142 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	143 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	144 va_end(va2);
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	145
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	146 return ret;
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	147 }
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	148
70 a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	149 void xprintf(char *format, ...)
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	150 {
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	151 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	152 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	153
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	154 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	155 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	156 }
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	157
128 0a90a5fbc1bf Add xputs() to detect EOF on writes. Rob Landley <rob@landley.net> parents: 126 diff changeset	158 void xputs(char *s)
0a90a5fbc1bf Add xputs() to detect EOF on writes. Rob Landley <rob@landley.net> parents: 126 diff changeset	159 {
762 f169d9708518 Extend killall with support for -v and -i Elie De Brauwer <eliedebrauwer@gmail.com> parents: 744 diff changeset	160 if (EOF == puts(s) \|\| fflush(stdout)) perror_exit("write");
128 0a90a5fbc1bf Add xputs() to detect EOF on writes. Rob Landley <rob@landley.net> parents: 126 diff changeset	161 }
0a90a5fbc1bf Add xputs() to detect EOF on writes. Rob Landley <rob@landley.net> parents: 126 diff changeset	162
70 a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	163 void xputc(char c)
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	164 {
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	165 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	166 }
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	167
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	168 void xflush(void)
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	169 {
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	170 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	171 }
a1b464bbef08 Add "echo". Has -n and -e (but not \0123 yet). Rob Landley <rob@landley.net> parents: 63 diff changeset	172
3 266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	173 // Die unless we can exec argv[] (or run builtin command). Note that anything
266a462ed18c Next drop of toysh, plus more infratructure. landley@driftwood parents: 2 diff changeset	174 // with a path isn't a builtin, so /bin/sh won't match the builtin sh.
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	175 void xexec(char **argv)
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	176 {
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	177 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	178 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	179
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	180 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	181 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	182
51 63edd4de94dd Add xaccess() Rob Landley <rob@landley.net> parents: 50 diff changeset	183 void xaccess(char *path, int flags)
63edd4de94dd Add xaccess() Rob Landley <rob@landley.net> parents: 50 diff changeset	184 {
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	185 if (access(path, flags)) perror_exit("Can't access '%s'", path);
51 63edd4de94dd Add xaccess() Rob Landley <rob@landley.net> parents: 50 diff changeset	186 }
63edd4de94dd Add xaccess() Rob Landley <rob@landley.net> parents: 50 diff changeset	187
214 98820d1eaa79 Upgrade patch to understand creating and deleting files. Rob Landley <rob@landley.net> parents: 209 diff changeset	188 // 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	189 void xunlink(char *path)
98820d1eaa79 Upgrade patch to understand creating and deleting files. Rob Landley <rob@landley.net> parents: 209 diff changeset	190 {
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	191 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	192 }
98820d1eaa79 Upgrade patch to understand creating and deleting files. Rob Landley <rob@landley.net> parents: 209 diff changeset	193
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	194 // 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	195 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	196 {
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	197 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	198 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	199 return fd;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	200 }
67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	201
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	202 // 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	203 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	204 {
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	205 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	206 }
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
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	208 void xclose(int fd)
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	209 {
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	210 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	211 }
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	212
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	213 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	214 {
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	215 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	216 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	217 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	218 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing 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 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	220 }
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
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	222 // 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	223 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	224 {
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	225 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	226 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	227 return f;
2 67b517913e56 Infrastructure, first drop of toy shell, and a bit of work on df. landley@driftwood parents: diff changeset	228 }
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	229
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	230 // 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	231 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	232 {
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	233 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	234
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	235 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	236 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	237 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	238 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	239 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	240 }
8 04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	241
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	242 return count;
8 04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	243 }
04f66da2bdbf Add reread(), readall(), and xread() on the bus ride in to work... landley@driftwood parents: 7 diff changeset	244
50 63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	245 // 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	246 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	247 {
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	248 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	249 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	250 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	251 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	252 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	253 }
50 63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	254
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	255 return count;
50 63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	256 }
63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	257
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	258 // 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	259 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	260 {
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	261 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	262 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	263
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	264 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	265 }
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
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	267 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	268 {
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	269 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	270 }
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	271
63 69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	272 // 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	273 // 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	274 // somewhere.
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	275
69efffcacd70 Add fdprintf(). Remove reread() and rewrite() which handle -EINTR, which Rob Landley <rob@landley.net> parents: 53 diff changeset	276 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	277 {
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	278 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	279 }
63c168b65fa6 Add rewrite(), writeall(),and xwrite() to match the read versions. Rob Landley <rob@landley.net> parents: 49 diff changeset	280
340 6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	281 // Die if lseek fails, probably due to being called on a pipe.
6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	282
6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	283 off_t xlseek(int fd, off_t offset, int whence)
6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	284 {
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	285 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	286 if (offset<0) perror_exit("lseek");
340 6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	287
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	288 return offset;
340 6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	289 }
6e03d6a8df23 Add mkswap. Rob Landley <rob@landley.net> parents: 337 diff changeset	290
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	291 off_t lskip(int fd, off_t offset)
f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	292 {
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	293 off_t and = lseek(fd, offset, SEEK_CUR);
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	294
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	295 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	296 && 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	297 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	298 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	299 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	300 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	301
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	302 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	303 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	304 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	305 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	306 }
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	307
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	308 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	309 }
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	310 }
f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	311
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	312 char *xgetcwd(void)
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	313 {
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	314 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	315 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	316
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	317 return buf;
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	318 }
732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	319
95 a636e4d20f13 Add xstat(), read_dirtree(), and read_dirtree_node(). Rob Landley <rob@landley.net> parents: 77 diff changeset	320 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	321 {
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	322 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	323 }
a636e4d20f13 Add xstat(), read_dirtree(), and read_dirtree_node(). Rob Landley <rob@landley.net> parents: 77 diff changeset	324
708 50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	325 // Split a path into linked list of components, tracking head and tail of list.
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	326 // Filters out // entries with no contents.
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	327 struct string_list *splitpath(char path, struct string_list **list)
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	328 {
708 50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	329 char *new = path;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	330
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	331 *list = 0;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	332 do {
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	333 int len;
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	334
708 50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	335 if (path && path != '/') continue;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	336 len = path-new;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	337 if (len > 0) {
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	338 *list = xmalloc(sizeof(struct string_list) + len + 1);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	339 (*list)->next = 0;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	340 strncpy((*list)->str, new, len);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	341 (*list)->str[len] = 0;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	342 list = &(*list)->next;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	343 }
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	344 new = path+1;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	345 } while (*path++);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	346
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	347 return list;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	348 }
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	349
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	350 // Cannonicalize path, even to file with one or more missing components at end.
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	351 // if exact, require last path component to exist
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	352 char xabspath(char path, int exact)
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	353 {
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	354 struct string_list todo, done = 0;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	355 int try = 9999, dirfd = open("/", 0);;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	356 char buf[4096], *ret;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	357
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	358 // If this isn't an absolute path, start with cwd.
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	359 if (*path != '/') {
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	360 char *temp = xgetcwd();
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	361
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	362 splitpath(path, splitpath(temp, &todo));
707 977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	363 free(temp);
708 50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	364 } else splitpath(path, &todo);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	365
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	366 // Iterate through path components
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	367 while (todo) {
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	368 struct string_list new = llist_pop(&todo), *tail;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	369 ssize_t len;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	370
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	371 if (!try--) {
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	372 errno = ELOOP;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	373 goto error;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	374 }
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	375
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	376 // Removable path componenents.
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	377 if (!strcmp(new->str, ".") \|\| !strcmp(new->str, "..")) {
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	378 if (new->str[1] && done) free(llist_pop(&done));
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	379 free(new);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	380 continue;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	381 }
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	382
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	383 // Is this a symlink?
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	384 len=readlinkat(dirfd, new->str, buf, 4096);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	385 if (len>4095) goto error;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	386 if (len<1) {
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	387 int fd;
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 153 diff changeset	388
708 50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	389 // Not a symlink: add to linked list, move dirfd, fail if error
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	390 if ((exact \|\| todo) && errno != EINVAL) goto error;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	391 new->next = done;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	392 done = new;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	393 fd = openat(dirfd, new->str, O_DIRECTORY);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	394 if (fd == -1 && (exact \|\| todo)) goto error;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	395 close(dirfd);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	396 dirfd = fd;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	397 continue;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	398 }
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	399
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	400 // If this symlink is to an absolute path, discard existing resolved path
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	401 buf[len] = 0;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	402 if (*buf == '/') {
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	403 llist_traverse(done, free);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	404 done=0;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	405 close(dirfd);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	406 dirfd = open("/", 0);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	407 }
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	408 free(new);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	409
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	410 // prepend components of new path. Note symlink to "/" will leave new NULL
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	411 tail = splitpath(buf, &new);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	412
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	413 // symlink to "/" will return null and leave tail alone
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	414 if (new) {
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	415 *tail = todo;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	416 todo = new;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	417 }
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	418 }
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	419 close(dirfd);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	420
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	421 // At this point done has the path, in reverse order. Reverse list while
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	422 // calculating buffer length.
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	423
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	424 try = 2;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	425 while (done) {
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	426 struct string_list *temp = llist_pop(&done);;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	427
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	428 if (todo) try++;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	429 try += strlen(temp->str);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	430 temp->next = todo;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	431 todo = 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	432 }
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	433
708 50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	434 // Assemble return buffer
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	435
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	436 ret = xmalloc(try);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	437 *ret = '/';
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	438 ret [try = 1] = 0;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	439 while (todo) {
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	440 if (try>1) ret[try++] = '/';
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	441 try = stpcpy(ret+try, todo->str) - ret;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	442 free(llist_pop(&todo));
707 977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	443 }
977e19296b3f Update readlink so -f works. Add -menq while there. Rob Landley <rob@landley.net> parents: 698 diff changeset	444
708 50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	445 return ret;
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	446
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	447 error:
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	448 close(dirfd);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	449 llist_traverse(todo, free);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	450 llist_traverse(done, free);
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	451
50d759f8b371 Remove readlink -m for being poorly defined ("readlink -m /dev/null/and/more" answers what question, exactly?), rewrite xabspath() to work right and not depend on realpath, fix subtle longstanding bug in llist_traverse(). Rob Landley <rob@landley.net> parents: 707 diff changeset	452 return NULL;
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	453 }
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	454
585 1dcd7994abea Add xrealpath() at suggestion of Ashish Briggers. Rob Landley <rob@landley.net> parents: 578 diff changeset	455 // Resolve all symlinks, returning malloc() memory.
1dcd7994abea Add xrealpath() at suggestion of Ashish Briggers. Rob Landley <rob@landley.net> parents: 578 diff changeset	456 char xrealpath(char path)
1dcd7994abea Add xrealpath() at suggestion of Ashish Briggers. Rob Landley <rob@landley.net> parents: 578 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 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	459 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	460 return new;
585 1dcd7994abea Add xrealpath() at suggestion of Ashish Briggers. Rob Landley <rob@landley.net> parents: 578 diff changeset	461 }
1dcd7994abea Add xrealpath() at suggestion of Ashish Briggers. Rob Landley <rob@landley.net> parents: 578 diff changeset	462
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	463 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	464 {
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	465 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	466 }
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	467
216 5697a3f7c8cf Make patch's file add actually work, including directory creating and Rob Landley <rob@landley.net> parents: 214 diff changeset	468 // 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	469 // 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	470 // 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	471 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	472 {
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	473 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	474 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	475 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	476 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	477
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	478 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	479 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	480 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	481 *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	482 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	483 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	484 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	485 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	486 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	487 } 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	488 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	489 *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	490 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	491 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	492 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	493 }
216 5697a3f7c8cf Make patch's file add actually work, including directory creating and Rob Landley <rob@landley.net> parents: 214 diff changeset	494 }
370 c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	495
c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	496 // 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	497 // 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	498
c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	499 void xsetuid(uid_t uid)
c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	500 {
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	501 if (setuid(uid)) perror_exit("xsetuid");
370 c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	502 }
c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	503
c7a26e26ad08 Add TOYBOX_SUID. Rob Landley <rob@landley.net> parents: 369 diff changeset	504
20 3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	505 // 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	506 // 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	507 // order.
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	508
20 3981c96f9285 Implement which. Add hello world to menuconfig. Wrap the various applet main Rob Landley <rob@landley.net> parents: 16 diff changeset	509 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	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 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	512 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	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 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	515 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	516 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	517 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	518 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	519
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	520 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	521 + (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	522 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	523 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	524 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	525 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	526 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	527 *(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	528 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	529 }
16 dd10785b6532 Add xabspath(), is_file_type(), which_in_path(), and find_in_path(). Rob Landley <rob@landley.net> parents: 8 diff changeset	530
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	531 // 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	532 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	533 *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	534 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	535 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	536 } 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	537
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	538 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	539 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	540 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	541 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing 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 free(cwd);
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	543
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	544 return rlist;
4 732b055e17f7 Add xmsprintf(), xgetcwd(), xgetcwd(), find_in_path(). landley@driftwood parents: 3 diff changeset	545 }
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	546
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	547 // 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	548 // 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	549 // 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	550 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	551 {
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	552 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	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 (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	555 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	556 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	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 ((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	559 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	560 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	561 *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	562 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing 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 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing 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 *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	565 }
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	566 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	567
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	568 // 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	569 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	570 {
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	571 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	572 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	573 *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	574 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	575 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing 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 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	577 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	578
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	579 // 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	580 // 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	581 //
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	582 // 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	583 // 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	584 // 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	585
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	586 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	587
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	588 // 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	589 char *utoa(unsigned n)
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	590 {
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	591 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	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 return itoa_buf;
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	594 }
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	595
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	596 char *itoa(int n)
fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	597 {
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	598 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	599
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	600 return itoa_buf;
7 fc9c0503d5e2 Implement df. Add -Wall to build and fix up warnings. Add copyright notices. landley@driftwood parents: 4 diff changeset	601 }
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	602
102 aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	603 // 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	604 // (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	605 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	606 {
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	607 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	608 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	609
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	610 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	611 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	612 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	613 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	614 } 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	615 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	616 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	617 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	618 }
397 b7afbc6b753a Forgot to check in loopfiles_rw changes needed by truncate. Rob Landley <rob@landley.net> parents: 379 diff changeset	619
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	620 return val;
102 aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	621 }
aa4fa2543a65 Add atolx() which understands extensions for kilobytes and megabytes and such. Rob Landley <rob@landley.net> parents: 97 diff changeset	622
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	623 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	624 {
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	625 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	626 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	627 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	628 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	629 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	630 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	631 }
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	632
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	633 int stridx(char *haystack, char needle)
f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	634 {
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	635 char *off;
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	636
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	637 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	638 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	639 if (!off) return -1;
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	640
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	641 return off-haystack;
623 f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	642 }
f51beec92738 New infrastructure for od (oops). Rob Landley <rob@landley.net> parents: 615 diff changeset	643
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	644 // 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	645 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	646 {
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	647 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	648 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	649
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	650 // 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	651
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	652 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	653
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	654 // 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	655 // 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	656 // 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	657
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	658 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	659 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	660 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	661
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	662 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	663
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	664 // 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	665
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	666 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	667 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	668 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	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 // 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	671
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	672 } 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	673 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	674 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	675 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	676 } 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	677 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	678 } 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	679
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	680 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	681
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 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	683 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	684
115 19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	685 // 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	686 // 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	687 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	688 {
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	689 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	690 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	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 // 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	693 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	694 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	695 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	696 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	697
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	698 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	699 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	700 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	701 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	702 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	703 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	704 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	705 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing 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 }
115 19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	707 }
19b5567f0a1b Add readlink, xreadlink(), and change xrealloc() to not fight the stupid Rob Landley <rob@landley.net> parents: 102 diff changeset	708
77 8018c40605d9 The fdlength() ioctl apparently doesn't work on files (and the lseek trick Rob Landley <rob@landley.net> parents: 75 diff changeset	709 /*
8018c40605d9 The fdlength() ioctl apparently doesn't work on files (and the lseek trick Rob Landley <rob@landley.net> parents: 75 diff changeset	710 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	711
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	712 // 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	713 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	714 {
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	715 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	716 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	717 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	718
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	719 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	720 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	721 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	722 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	723 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	724
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	725 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	726 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	727
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	728 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	729 {
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	730 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	731 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	732 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	733 }
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	734
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	735 */
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	736
41d55b5d49fd Add start of mke2fs/gene2fs, and some other stuff I've been working on. Rob Landley <rob@landley.net> parents: 52 diff changeset	737 // 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	738 // 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	739 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	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 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	742 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	743 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	744
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	745 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	746 // 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	747 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	748 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	749 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	750
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	751 // 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	752 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	753 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	754
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	755 // 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	756 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	757 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	758 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	759 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	760
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	761 // 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	762 }
156 1e8f4b05cb65 Remove trailing whitespace (thanks to Charlie Shepherd), and a couple comment Rob Landley <rob@landley.net> parents: 153 diff changeset	763
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	764 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	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 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	767 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	768 }
185 29e2051296fd Add loopfiles() function, make catv use it. Rob Landley <rob@landley.net> parents: 167 diff changeset	769
308 52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	770 // 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	771 // on that filehandle and name. The special filename "-" means stdin if
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	772 // flags is O_RDONLY, stdout otherwise. An empty argument list calls
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	773 // function() on just stdin/stdout.
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	774 //
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	775 // Note: read only filehandles are automatically closed when function()
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	776 // 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	777 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	778 void (function)(int fd, char name))
185 29e2051296fd Add loopfiles() function, make catv use it. Rob Landley <rob@landley.net> parents: 167 diff changeset	779 {
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	780 int fd;
185 29e2051296fd Add loopfiles() function, make catv use it. Rob Landley <rob@landley.net> parents: 167 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 // 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	783 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	784 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	785 // 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	786 // 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	787
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	788 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	789 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	790 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	791 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	792 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	793 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing 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 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	795 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	796 } while (*++argv);
185 29e2051296fd Add loopfiles() function, make catv use it. Rob Landley <rob@landley.net> parents: 167 diff changeset	797 }
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	798
397 b7afbc6b753a Forgot to check in loopfiles_rw changes needed by truncate. Rob Landley <rob@landley.net> parents: 379 diff changeset	799 // Call loopfiles_rw with O_RDONLY and !failok (common case).
308 52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	800 void loopfiles(char *argv, void (function)(int fd, char *name))
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	801 {
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	802 loopfiles_rw(argv, O_RDONLY, 0, 0, function);
308 52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	803 }
52600eee8dd6 Add "tee" command. Rob Landley <rob@landley.net> parents: 295 diff changeset	804
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	805 // Slow, but small.
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	806
284 603275a05524 Teach get_rawline() to continue until a configurable char, and xstrndup() Rob Landley <rob@landley.net> parents: 252 diff changeset	807 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	808 {
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	809 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	810 long len = 0;
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	811
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	812 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	813 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	814 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	815 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	816 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	817 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	818 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	819
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	820 return buf;
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	821 }
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	822
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	823 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	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 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	826 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	827
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	828 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	829
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	830 return buf;
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	831 }
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	832
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	833 // 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	834
5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	835 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	836 {
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	837 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	838 char buf[4096];
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	839
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	840 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	841 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	842 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	843 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	844 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	845 }
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	846 }
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	847
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	848 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	849 {
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	850 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	851
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	852 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	853 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	854 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	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 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	857 }
7becb497c3c4 Update chmod to work with new dirtree, and fix bugs in string_to_mode(). Rob Landley <rob@landley.net> parents: 585 diff changeset	858
643 7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	859 static char *tempfile2zap;
7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	860 static void tempfile_handler(int i)
7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	861 {
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	862 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	863 _exit(1);
643 7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	864 }
7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	865
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	866 // Open a temporary file to copy an existing file into.
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	867 int copy_tempfile(int fdin, char name, char *tempname)
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	868 {
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	869 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	870 int fd;
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	871
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	872 *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	873 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	874 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	875 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	876 tempfile2zap = *tempname;
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	877
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	878 // Set permissions of output file
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	879
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	880 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	881 fchmod(fd, statbuf.st_mode);
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	882
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	883 return fd;
201 5d523752715a Start of "patch" support. Writes to stdout at the moment. Rob Landley <rob@landley.net> parents: 197 diff changeset	884 }
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	885
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	886 // Abort the copy and delete the temporary file.
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	887 void delete_tempfile(int fdin, int fdout, char **tempname)
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	888 {
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	889 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	890 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	891 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	892 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	893 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	894 *tempname = NULL;
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	895 }
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	896
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	897 // 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	898 void replace_tempfile(int fdin, int fdout, char **tempname)
9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 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 char temp = xstrdup(tempname);
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 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 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	903 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	904 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	905 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	906 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing 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 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	908 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	909 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	910 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	911 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	912 *tempname = NULL;
209 9a0d4e8a9c61 Patch command. Rob Landley <rob@landley.net> parents: 201 diff changeset	913 }
334 83c461db9df7 Check in crc_init needed by cksum. (Oops.) Rob Landley <rob@landley.net> parents: 311 diff changeset	914
83c461db9df7 Check in crc_init needed by cksum. (Oops.) Rob Landley <rob@landley.net> parents: 311 diff changeset	915 // 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	916
337 aaafa1ceaa91 Add -N, -I, -L, and -P options to cksum. Rob Landley <rob@landley.net> parents: 334 diff changeset	917 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	918 {
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	919 unsigned int i;
334 83c461db9df7 Check in crc_init needed by cksum. (Oops.) Rob Landley <rob@landley.net> parents: 311 diff changeset	920
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	921 // 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	922 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	923 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	924 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	925 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	926 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	927 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	928 }
334 83c461db9df7 Check in crc_init needed by cksum. (Oops.) Rob Landley <rob@landley.net> parents: 311 diff changeset	929 }
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	930
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	931 // 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	932 // 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	933 // 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	934
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	935 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	936 {
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	937 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	938 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	939
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	940 //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	941 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	942 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	943 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	944 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	945 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing 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 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	947 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	948
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	949 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	950 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	951 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing 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 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	953 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	954
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	955 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	956 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	957 }
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	958 }
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	959
503 3b9dea897dc0 Upgrade yesno() and make cp -i use it. Rob Landley <rob@landley.net> parents: 498 diff changeset	960 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	961 {
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	962 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	963
738 075eaff297f8 Make yesno() always read from stdin and write to stderr. (If we need to find our tty, open /dev/tty, but existing users don't.) Rob Landley <rob@landley.net> parents: 715 diff changeset	964 fprintf(stderr, "%s (%c/%c):", prompt, def ? 'Y' : 'y', def ? 'n' : 'N');
075eaff297f8 Make yesno() always read from stdin and write to stderr. (If we need to find our tty, open /dev/tty, but existing users don't.) Rob Landley <rob@landley.net> parents: 715 diff changeset	965 fflush(stderr);
075eaff297f8 Make yesno() always read from stdin and write to stderr. (If we need to find our tty, open /dev/tty, but existing users don't.) Rob Landley <rob@landley.net> parents: 715 diff changeset	966 while (fread(&buf, 1, 1, stdin)) {
075eaff297f8 Make yesno() always read from stdin and write to stderr. (If we need to find our tty, open /dev/tty, but existing users don't.) Rob Landley <rob@landley.net> parents: 715 diff changeset	967 int new;
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	968
738 075eaff297f8 Make yesno() always read from stdin and write to stderr. (If we need to find our tty, open /dev/tty, but existing users don't.) Rob Landley <rob@landley.net> parents: 715 diff changeset	969 if (isspace(buf)) break;
075eaff297f8 Make yesno() always read from stdin and write to stderr. (If we need to find our tty, open /dev/tty, but existing users don't.) Rob Landley <rob@landley.net> parents: 715 diff changeset	970 if (-1 != (new = stridx("ny", tolower(buf)))) def = new;
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	971 }
550 b2194045c40e Remove "feature test macros", replace non-portable fdprintf() with standard fprintf(). Rob Landley <rob@landley.net> parents: 535 diff changeset	972
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	973 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	974 }
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	975
1fb149e75ebf Add killall by Andreas Heck, and factor out common pid code to lib.h. Rob Landley <rob@landley.net> parents: 443 diff changeset	976 // Execute a callback for each PID that matches a process name from a list.
762 f169d9708518 Extend killall with support for -v and -i Elie De Brauwer <eliedebrauwer@gmail.com> parents: 744 diff changeset	977 void for_each_pid_with_name_in(char *names, int (callback)(pid_t pid, char *name))
477 f0b07ce5f125 Cleanups to pidof (including some global infrastructure shared with killall). Rob Landley <rob@landley.net> parents: 475 diff changeset	978 {
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	979 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	980 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	981 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	982 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	983
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	984 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	985
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	986 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	987 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	988
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	989 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	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 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	992 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	993
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	994 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	995 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	996 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	997 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	998
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	999 for (curname = names; *curname; curname++)
744 43e6ec52aa29 Adding -s (single shot) and -o (omit pids) options to pidof Elie De Brauwer <eliedebrauwer@gmail.com> parents: 738 diff changeset	1000 if (!strcmp(basename(cmd), *curname))
762 f169d9708518 Extend killall with support for -v and -i Elie De Brauwer <eliedebrauwer@gmail.com> parents: 744 diff changeset	1001 if (!callback(atol(entry->d_name), *curname)) goto done;
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	1002 }
744 43e6ec52aa29 Adding -s (single shot) and -o (omit pids) options to pidof Elie De Brauwer <eliedebrauwer@gmail.com> parents: 738 diff changeset	1003 done:
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	1004 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	1005 }
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	1006
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	1007 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	1008 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	1009 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	1010 };
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	1011
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	1012 // 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	1013 // 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	1014
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	1015 #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	1016
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	1017 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	1018 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	1019 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	1020 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	1021 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	1022 SIGNIFY(VTALRM), SIGNIFY(XCPU), SIGNIFY(XFSZ),
643 7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	1023
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	1024 // Start of non-terminal signals
643 7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	1025
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	1026 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	1027 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	1028 };
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	1029
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	1030 // 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	1031 // 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	1032
643 7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	1033 // 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	1034 void sigatexit(void *handler)
7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 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 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	1037 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	1038 }
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	1039 // 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	1040 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	1041 {
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	1042 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	1043
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	1044 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	1045 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	1046 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	1047 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	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 (!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	1050 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing 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 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	1052 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	1053 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	1054
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	1055 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	1056 }
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	1057
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	1058 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	1059 {
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	1060 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	1061
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	1062 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	1063 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	1064 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	1065 }
551 2548e6e590b2 Add string to mode_t parser Daniel Walter <d.walter@0x90.at> parents: 550 diff changeset	1066
643 7bdebd2af1d6 Add signal handler to clean up tempfile. Rob Landley <rob@landley.net> parents: 640 diff changeset	1067 // 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	1068 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	1069 {
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	1070 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	1071 char s, str = modestr;
553 75da5d793fc8 Unwind gratuitous macros. Rob Landley <rob@landley.net> parents: 551 diff changeset	1072
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	1073 // 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	1074 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	1075 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	1076 if (*s \|\| (mode & ~(07777))) goto barf;
553 75da5d793fc8 Unwind gratuitous macros. Rob Landley <rob@landley.net> parents: 551 diff changeset	1077
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	1078 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	1079 }
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1080
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	1081 // 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	1082 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	1083 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	1084
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	1085 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	1086
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	1087 // 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	1088 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	1089 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	1090 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	1091 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1092 // 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	1093 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	1094 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	1095 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	1096 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1097 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	1098 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	1099
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	1100 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	1101 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	1102 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	1103 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	1104 }
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1105
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	1106 // 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	1107 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	1108
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	1109 // 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	1110 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	1111 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	1112 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	1113 }
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1114
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	1115 // 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	1116 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	1117
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	1118 // 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	1119 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	1120 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	1121 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	1122 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	1123
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	1124 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	1125
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	1126 // 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	1127 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	1128 // 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	1129 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	1130 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	1131 } 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	1132 } 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	1133 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	1134 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	1135 }
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1136
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	1137 // 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	1138
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	1139 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	1140 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	1141 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1142 }
578 5cc8a8fc08b4 First pass at a complete rewrite of string_to_mode(). (It compiled!) Rob Landley <rob@landley.net> parents: 565 diff changeset	1143
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	1144 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	1145 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1146 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	1147 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	1148 error_exit("bad mode '%s'", modestr);
551 2548e6e590b2 Add string to mode_t parser Daniel Walter <d.walter@0x90.at> parents: 550 diff changeset	1149 }
658 2b957eaa00c7 Add du command. Ashwini Kumar <ak.ashwini@gmail.com> parents: 643 diff changeset	1150
2b957eaa00c7 Add du command. Ashwini Kumar <ak.ashwini@gmail.com> parents: 643 diff changeset	1151
2b957eaa00c7 Add du command. Ashwini Kumar <ak.ashwini@gmail.com> parents: 643 diff changeset	1152 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	1153 {
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	1154 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	1155 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	1156 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	1157 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	1158 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1159 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	1160 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	1161 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	1162 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	1163 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	1164 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	1165 index++;
658 2b957eaa00c7 Add du command. Ashwini Kumar <ak.ashwini@gmail.com> parents: 643 diff changeset	1166 }
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	1167 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	1168 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	1169 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	1170 frac = 0;
658 2b957eaa00c7 Add du command. Ashwini Kumar <ak.ashwini@gmail.com> parents: 643 diff changeset	1171 }
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	1172 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	1173 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	1174 }
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 671 diff changeset	1175 return NULL; //not reached
658 2b957eaa00c7 Add du command. Ashwini Kumar <ak.ashwini@gmail.com> parents: 643 diff changeset	1176 }
698 078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1177
715 3417db95f24b Add expand command as described in POSIX-2008. Jonathan Clairembault <jonathan@clairembault.fr> parents: 708 diff changeset	1178 // strtoul with exit on error
3417db95f24b Add expand command as described in POSIX-2008. Jonathan Clairembault <jonathan@clairembault.fr> parents: 708 diff changeset	1179 unsigned long xstrtoul(const char nptr, char *endptr, int base)
3417db95f24b Add expand command as described in POSIX-2008. Jonathan Clairembault <jonathan@clairembault.fr> parents: 708 diff changeset	1180 {
3417db95f24b Add expand command as described in POSIX-2008. Jonathan Clairembault <jonathan@clairembault.fr> parents: 708 diff changeset	1181 unsigned long l;
3417db95f24b Add expand command as described in POSIX-2008. Jonathan Clairembault <jonathan@clairembault.fr> parents: 708 diff changeset	1182 errno = 0;
3417db95f24b Add expand command as described in POSIX-2008. Jonathan Clairembault <jonathan@clairembault.fr> parents: 708 diff changeset	1183 l = strtoul(nptr, endptr, base);
3417db95f24b Add expand command as described in POSIX-2008. Jonathan Clairembault <jonathan@clairembault.fr> parents: 708 diff changeset	1184 if (errno)
3417db95f24b Add expand command as described in POSIX-2008. Jonathan Clairembault <jonathan@clairembault.fr> parents: 708 diff changeset	1185 perror_exit("xstrtoul");
3417db95f24b Add expand command as described in POSIX-2008. Jonathan Clairembault <jonathan@clairembault.fr> parents: 708 diff changeset	1186 return l;
3417db95f24b Add expand command as described in POSIX-2008. Jonathan Clairembault <jonathan@clairembault.fr> parents: 708 diff changeset	1187 }
3417db95f24b Add expand command as described in POSIX-2008. Jonathan Clairembault <jonathan@clairembault.fr> parents: 708 diff changeset	1188
698 078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1189 /*
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1190 * used to get the interger value.
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1191 */
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1192 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	1193 {
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1194 unsigned long rvalue = 0;
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1195 char *ptr;
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1196 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	1197 errno = 0;
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1198 rvalue = strtoul(numstr, &ptr, 10);
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1199 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	1200 if(*ptr) perror_exit("invalid number '%s'", numstr);
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1201 if(rvalue >= lowrange && rvalue <= highrange) return rvalue;
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1202 else {
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1203 perror_exit("invalid number '%s'", numstr);
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1204 return rvalue; //Not reachable; to avoid waring message.
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1205 }
078138791b5c Add cut from Jason Kyungwan Han. Rob Landley <rob@landley.net> parents: 696 diff changeset	1206 }

Mercurial > hg > toybox

annotate lib/lib.c @ 780:6cc69be43c42