| @@ -0,0 +1,754 @@
+Index: examples/loadables/Makefile.in
+===================================================================
+--- examples/loadables/Makefile.in.orig
++++ examples/loadables/Makefile.in
+@@ -83,7 +83,7 @@ INC = -I. -I.. -I$(topdir) -I$(topdir)/l
+ $(SHOBJ_CC) $(SHOBJ_CFLAGS) $(CCFLAGS) $(INC) -c -o $@ $<
+
+
+-ALLPROG = print truefalse sleep pushd finfo logname basename dirname \
++ALLPROG = print sleep finfo logname basename dirname \
+ tty pathchk tee head mkdir rmdir printenv id whoami \
+ uname sync push ln unlink cut realpath getconf strftime mypid
+ OTHERPROG = necho hello cat
+Index: examples/loadables/basename.c
+===================================================================
+--- examples/loadables/basename.c.orig
++++ examples/loadables/basename.c
+@@ -9,10 +9,13 @@
+ #endif
+
+ #include <stdio.h>
+-#include "builtins.h"
+ #include "shell.h"
+ #include "common.h"
++#include "builtins.h"
++#include "builtins/builtext.h"
++#include "builtins/common.h"
+
++int
+ basename_builtin (list)
+ WORD_LIST *list;
+ {
+Index: examples/loadables/cat.c
+===================================================================
+--- examples/loadables/cat.c.orig
++++ examples/loadables/cat.c
+@@ -25,8 +25,10 @@
+ #include <fcntl.h>
+ #include <errno.h>
+
+-#include "builtins.h"
+ #include "shell.h"
++#include "builtins.h"
++#include "builtins/builtext.h"
++#include "builtins/common.h"
+
+ #ifndef errno
+ extern int errno;
+Index: examples/loadables/cut.c
+===================================================================
+--- examples/loadables/cut.c.orig
++++ examples/loadables/cut.c
+@@ -60,8 +60,10 @@ static const char sccsid[] = "@(#)cut.c
+ # include <unistd.h>
+ #endif
+
+-#include "builtins.h"
+ #include "shell.h"
++#include "builtins.h"
++#include "builtins/builtext.h"
++#include "builtins/common.h"
+ #include "bashgetopt.h"
+ #include "common.h"
+
+@@ -244,7 +246,7 @@ c_cut(fp, fname)
+ pos = positions + 1;
+ for (col = maxval; col; --col) {
+ if ((ch = getc(fp)) == EOF)
+- return;
++ return (0);
+ if (ch == '\n')
+ break;
+ if (*pos++)
+Index: examples/loadables/dirname.c
+===================================================================
+--- examples/loadables/dirname.c.orig
++++ examples/loadables/dirname.c
+@@ -27,10 +27,13 @@
+ #endif
+
+ #include <stdio.h>
+-#include "builtins.h"
+ #include "shell.h"
+ #include "common.h"
++#include "builtins.h"
++#include "builtins/builtext.h"
++#include "builtins/common.h"
+
++int
+ dirname_builtin (list)
+ WORD_LIST *list;
+ {
+Index: examples/loadables/finfo.c
+===================================================================
+--- examples/loadables/finfo.c.orig
++++ examples/loadables/finfo.c
+@@ -20,6 +20,8 @@
+ #include "bashansi.h"
+ #include "shell.h"
+ #include "builtins.h"
++#include "builtins/builtext.h"
++#include "builtins/common.h"
+ #include "common.h"
+
+ #ifndef errno
+@@ -81,7 +83,7 @@ int argc;
+ char **argv;
+ {
+ register int i;
+- int mode, flags, opt;
++ int flags, opt;
+
+ sh_optind = 0; /* XXX */
+ prog = base_pathname(argv[0]);
+@@ -174,7 +176,7 @@ int m;
+ return (m & (S_IRWXU|S_IRWXG|S_IRWXO|S_ISUID|S_ISGID));
+ }
+
+-static int
++static void
+ perms(m)
+ int m;
+ {
+@@ -218,7 +220,7 @@ int m;
+ printf ("u=%s,g=%s,o=%s", ubits, gbits, obits);
+ }
+
+-static int
++static void
+ printmode(mode)
+ int mode;
+ {
+@@ -313,13 +315,13 @@ int flags;
+ else
+ printf("%ld\n", st->st_ctime);
+ } else if (flags & OPT_DEV)
+- printf("%d\n", st->st_dev);
++ printf("%lu\n", (ulong)st->st_dev);
+ else if (flags & OPT_INO)
+- printf("%d\n", st->st_ino);
++ printf("%lu\n", (ulong)st->st_ino);
+ else if (flags & OPT_FID)
+- printf("%d:%ld\n", st->st_dev, st->st_ino);
++ printf("%lu:%lu\n", (ulong)st->st_dev, (ulong)st->st_ino);
+ else if (flags & OPT_NLINK)
+- printf("%d\n", st->st_nlink);
++ printf("%lu\n", (ulong)st->st_nlink);
+ else if (flags & OPT_LNKNAM) {
+ #ifdef S_ISLNK
+ b = xmalloc(4096);
+@@ -369,7 +371,6 @@ finfo_builtin(list)
+ {
+ int c, r;
+ char **v;
+- WORD_LIST *l;
+
+ v = make_builtin_argv (list, &c);
+ r = finfo_main (c, v);
+Index: examples/loadables/getconf.c
+===================================================================
+--- examples/loadables/getconf.c.orig
++++ examples/loadables/getconf.c
+@@ -65,6 +65,8 @@
+ #include "bashansi.h"
+ #include "shell.h"
+ #include "builtins.h"
++#include "builtins/builtext.h"
++#include "builtins/common.h"
+ #include "stdc.h"
+ #include "common.h"
+ #include "bashgetopt.h"
+@@ -1119,8 +1121,6 @@ static const struct conf_variable conf_t
+ { NULL }
+ };
+
+-static int num_getconf_variables = sizeof(conf_table) / sizeof(struct conf_variable) - 1;
+-
+ extern char *this_command_name;
+ extern char **make_builtin_argv ();
+
+@@ -1133,8 +1133,7 @@ int
+ getconf_builtin (list)
+ WORD_LIST *list;
+ {
+- int c, r, opt, aflag;
+- char **v;
++ int r, opt, aflag;
+
+ aflag = 0;
+ reset_internal_getopt();
+@@ -1169,7 +1168,6 @@ static void
+ getconf_help()
+ {
+ const struct conf_variable *cp;
+- register int i, column;
+
+ builtin_usage();
+ printf("Acceptable variable names are:\n");
+Index: examples/loadables/head.c
|
