projects / packages / ash.git / blame
| Commit | Line | Data |
|---|---|---|
| 1127ab67 TO |
1 | diff -ruN ash-0.4.0.org/Makefile ash-0.4.0/Makefile |
| 2 | --- ash-0.4.0.org/Makefile Wed Sep 11 12:06:11 2002 | |
| 3 | +++ ash-0.4.0/Makefile Wed Sep 11 13:10:46 2002 | |
| 4 | @@ -50,9 +50,14 @@ | |
| 5 | init.c: mkinit $(INIT_DEPS) | |
| 6 | ./mkinit $(INIT_DEPS) | |
| 7 | ||
| 8 | -mkinit: mkinit.o | |
| 9 | -mknodes: mknodes.o | |
| 10 | -mksyntax: mksyntax.o | |
| 11 | +mkinit: mkinit.c | |
| 12 | + cc -o mkinit mkinit.c | |
| 13 | +mknodes: mknodes.c | |
| 14 | + cc -o mknodes mknodes.c | |
| 15 | +mksyntax: mksyntax.c | |
| 16 | + cc -o mksyntax mksyntax.c | |
| 17 | +mksignames: mksignames.c | |
| 18 | + cc -o mksignames mksignames.c | |
| 19 | ||
| 20 | signames.c: mksignames | |
| 21 | ./mksignames | |
| 22 | diff -ruN ash-0.4.0.org/error.h ash-0.4.0/error.h | |
| 23 | --- ash-0.4.0.org/error.h Wed Sep 11 12:06:11 2002 | |
| 24 | +++ ash-0.4.0/error.h Wed Sep 11 13:10:46 2002 | |
| 25 | @@ -102,7 +102,3 @@ | |
| 26 | * so we use _setjmp instead. | |
| 27 | */ | |
| 28 | ||
| 29 | -#if defined(BSD) && !defined(__SVR4) && !defined(__GLIBC__) | |
| 30 | -#define setjmp(jmploc) _setjmp(jmploc) | |
| 31 | -#define longjmp(jmploc, val) _longjmp(jmploc, val) | |
| 32 | -#endif | |
| 33 | diff -ruN ash-0.4.0.org/eval.c ash-0.4.0/eval.c | |
| 34 | --- ash-0.4.0.org/eval.c Wed Sep 11 12:06:11 2002 | |
| 35 | +++ ash-0.4.0/eval.c Wed Sep 11 13:10:46 2002 | |
| 1127ab67 TO |
36 | @@ -1149,11 +1150,8 @@ |
| 37 | get_standard_path() | |
| 38 | { | |
| 39 | char *p; | |
| 40 | - size_t len; | |
| 41 | ||
| 42 | - len = confstr(_CS_PATH, NULL, 0); | |
| 43 | - p = stalloc(len + 2); | |
| 44 | - *p = '\0'; | |
| 45 | - confstr(_CS_PATH, p, len); | |
| 46 | + p = stalloc(15); | |
| 47 | + *p = "/bin:/usr/bin"; | |
| 48 | return p; | |
| 49 | } | |
| 50 | diff -ruN ash-0.4.0.org/mksignames.c ash-0.4.0/mksignames.c | |
| 51 | --- ash-0.4.0.org/mksignames.c Wed Sep 11 12:06:11 2002 | |
| 52 | +++ ash-0.4.0/mksignames.c Wed Sep 11 13:11:00 2002 | |
| 53 | @@ -353,7 +353,7 @@ | |
| 54 | fprintf (stream, "#include <signal.h>\n\n"); | |
| 55 | fprintf (stream, | |
| 56 | "/* A translation list so we can be polite to our users. */\n"); | |
| 57 | - fprintf (stream, "char *signal_names[NSIG + 2] = {\n"); | |
| 58 | + fprintf (stream, "char *signal_names[66] = {\n"); | |
| 59 | ||
| 60 | for (i = 0; i <= NSIG; i++) | |
| 61 | fprintf (stream, " \"%s\",\n", signal_names[i]); | |
| 62 | diff -ruN ash-0.4.0.org/output.c ash-0.4.0/output.c | |
| 63 | --- ash-0.4.0.org/output.c Wed Sep 11 12:06:11 2002 | |
| 64 | +++ ash-0.4.0/output.c Wed Sep 11 13:10:46 2002 | |
| 65 | @@ -620,7 +620,7 @@ | |
| 66 | ||
| 67 | void | |
| 68 | openmemout() { | |
| 69 | - memout.stream = open_memstream(&memout.buf, &memout.bufsize); | |
| 70 | +// memout.stream = open_memstream(&memout.buf, &memout.bufsize); | |
| 71 | } | |
| 72 | ||
| 73 | ||
| 74 | diff -ruN ash-0.4.0.org/setmode.c ash-0.4.0/setmode.c | |
| 75 | --- ash-0.4.0.org/setmode.c Wed Sep 11 12:06:11 2002 | |
| 76 | +++ ash-0.4.0/setmode.c Wed Sep 11 13:10:46 2002 | |
| 77 | @@ -45,7 +45,9 @@ | |
| 78 | #endif | |
| 79 | #endif /* LIBC_SCCS and not lint */ | |
| 80 | ||
| 81 | +#define _BSD_SOURCE | |
| 82 | #include <sys/types.h> | |
| 83 | +#undef _BSD_SOURCE | |
| 84 | #include <sys/stat.h> | |
| 85 | ||
| 86 | #include <assert.h> | |
| 87 | @@ -64,9 +66,7 @@ | |
| 88 | __weak_alias(setmode,_setmode) | |
| 89 | #endif | |
| 90 | ||
| 91 | -#ifdef __GLIBC__ | |
| 92 | -#define S_ISTXT __S_ISVTX | |
| 93 | -#endif | |
| 94 | +#define S_ISTXT 01000 | |
| 95 | ||
| 96 | #define SET_LEN 6 /* initial # of bitcmd struct to malloc */ | |
| 97 | #define SET_LEN_INCR 4 /* # of bitcmd structs to add as needed */ |