home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Fresh Fish 4
/
FreshFish_May-June1994.bin
/
bbs
/
gnu
/
bash-1.13.4-src.lha
/
src
/
diffs
/
bash-1.13.4.diffs
< prev
Wrap
Text File
|
1993-12-14
|
20KB
|
641 lines
diff -rc bash-1.13.4-fsf/.machine bash-1.13.4-amiga/.machine
*** bash-1.13.4-fsf/.machine Tue Aug 31 20:37:31 1993
--- bash-1.13.4-amiga/.machine Sun Nov 21 14:41:24 1993
***************
*** 1 ****
! bash last made for a sparc running SunOS4
--- 1 ----
! bash last made for a amiga running amigados
diff -rc bash-1.13.4-fsf/Makefile bash-1.13.4-amiga/Makefile
*** bash-1.13.4-fsf/Makefile Tue Aug 31 18:52:30 1993
--- bash-1.13.4-amiga/Makefile Sat Nov 20 15:48:47 1993
***************
*** 18,25 ****
# Force CPPNAME to be the name of your C preprocesor if Bash can't
# find it. For instance, `CPPNAME=/usr/libexec/cpp' on 4.4 BSD.
! CPPNAME =
! CPP = `$(CPPMAGIC) $(GETCPPSYMS) $(CPPNAME)` -P
# If all else fails, try this line instead.
# CPP = $(CC) -E
--- 18,26 ----
# Force CPPNAME to be the name of your C preprocesor if Bash can't
# find it. For instance, `CPPNAME=/usr/libexec/cpp' on 4.4 BSD.
! CPPNAME = /gcc/lib/gcc-lib/amigados/2.5.7/cpp
! #CPP = `$(CPPMAGIC) $(GETCPPSYMS) $(CPPNAME)` -P
! CPP = $(CPPNAME) `$(GETCPPSYMS)` -P
# If all else fails, try this line instead.
# CPP = $(CC) -E
***************
*** 44,52 ****
# much trouble with this, just forget it. It is for making
# bash-Makefile pretty and readable; something that isn't strictly
# necessary.
! # SQUASH_BLANKS = cat -s
#
! SQUASH_BLANKS = $(GAWK) -f $(CAT_S)
all: .notified bash-Makefile
$(MAKE) $(MFLAGS) $(MAKEARGS) -f bash-Makefile
--- 45,53 ----
# much trouble with this, just forget it. It is for making
# bash-Makefile pretty and readable; something that isn't strictly
# necessary.
! SQUASH_BLANKS = cat -s
#
! #SQUASH_BLANKS = $(GAWK) -f $(CAT_S)
all: .notified bash-Makefile
$(MAKE) $(MFLAGS) $(MAKEARGS) -f bash-Makefile
diff -rc bash-1.13.4-fsf/bashline.c bash-1.13.4-amiga/bashline.c
*** bash-1.13.4-fsf/bashline.c Fri Nov 12 15:55:36 1993
--- bash-1.13.4-amiga/bashline.c Sat Nov 20 15:15:57 1993
***************
*** 1569,1576 ****
--- 1569,1578 ----
bash_complete_username_internal (what_to_do)
int what_to_do;
{
+ #ifndef amigados
bash_specific_completion
(what_to_do, (Function *)username_completion_function);
+ #endif /* amigados */
}
static void
diff -rc bash-1.13.4-fsf/builtins/Makefile bash-1.13.4-amiga/builtins/Makefile
*** bash-1.13.4-fsf/builtins/Makefile Tue Aug 31 18:52:32 1993
--- bash-1.13.4-amiga/builtins/Makefile Sat Nov 20 16:26:25 1993
***************
*** 59,66 ****
builtext.h builtins.c: $(MKBUILTINS) $(DEFS)
$(RM) builtext.h builtins.c
! ./$(MKBUILTINS) -externfile builtext.h -structfile builtins.c \
! -noproduction $(DIRECTDEFINE) $(DEFS)
mkbuiltins: mkbuiltins.c ../config.h
$(CC) $(CFLAGS) -o $(MKBUILTINS) mkbuiltins.c
--- 59,66 ----
builtext.h builtins.c: $(MKBUILTINS) $(DEFS)
$(RM) builtext.h builtins.c
! ./$(MKBUILTINS) -externfile - -noproduction $(DIRECTDEFINE) $(DEFS) >builtext.h
! ./$(MKBUILTINS) -structfile builtins.c -noproduction $(DIRECTDEFINE) $(DEFS)
mkbuiltins: mkbuiltins.c ../config.h
$(CC) $(CFLAGS) -o $(MKBUILTINS) mkbuiltins.c
diff -rc bash-1.13.4-fsf/builtins/mkbuiltins.c bash-1.13.4-amiga/builtins/mkbuiltins.c
*** bash-1.13.4-fsf/builtins/mkbuiltins.c Tue Aug 31 18:52:33 1993
--- bash-1.13.4-amiga/builtins/mkbuiltins.c Sat Nov 20 15:16:04 1993
***************
*** 201,207 ****
if (extern_filename)
{
! externfile = fopen (extern_filename, "w");
if (!externfile)
file_error (extern_filename);
--- 201,210 ----
if (extern_filename)
{
! if (strcmp (extern_filename, "-") == 0)
! externfile = stdout;
! else
! externfile = fopen (extern_filename, "w");
if (!externfile)
file_error (extern_filename);
***************
*** 242,248 ****
unlink (temp_struct_filename);
}
! if (externfile)
fclose (externfile);
}
--- 245,251 ----
unlink (temp_struct_filename);
}
! if (externfile && externfile != stdout)
fclose (externfile);
}
***************
*** 1049,1054 ****
--- 1052,1058 ----
/* Write the extern definition. */
if (externfile)
{
+ fprintf (externfile, "/* %s */\n", defs -> filename);
if (builtin->function)
fprintf (externfile, "extern int %s ();\n",
builtin->function);
diff -rc bash-1.13.4-fsf/builtins/psize.sh bash-1.13.4-amiga/builtins/psize.sh
*** bash-1.13.4-fsf/builtins/psize.sh Tue Aug 31 18:52:34 1993
--- bash-1.13.4-amiga/builtins/psize.sh Sat Nov 20 15:16:06 1993
***************
*** 11,17 ****
echo " */"
echo ""
! ./psize.aux 2>/tmp/pipesize | sleep 3
echo "#define PIPESIZE `cat /tmp/pipesize`"
--- 11,20 ----
echo " */"
echo ""
! #./psize.aux 2>/tmp/pipesize | sleep 3
! # Begin Amiga hack
! echo 5120 >/tmp/pipesize
! #endif Amiga hack
echo "#define PIPESIZE `cat /tmp/pipesize`"
diff -rc bash-1.13.4-fsf/config.h bash-1.13.4-amiga/config.h
*** bash-1.13.4-fsf/config.h Tue Aug 31 18:52:35 1993
--- bash-1.13.4-amiga/config.h Sat Nov 20 16:07:25 1993
***************
*** 52,58 ****
--- 52,60 ----
/* Define JOB_CONTROL if your operating system supports
BSD-like job control. */
+ #ifndef amigados
#define JOB_CONTROL
+ #endif /* amigados */
/* Note that vanilla System V machines don't support BSD job control,
although some do support Posix job control. */
***************
*** 98,110 ****
--- 100,122 ----
#endif /* BANG_HISTORY && !HISTORY */
/* The default value of the PATH variable. */
+ #ifdef amigados
+ #define DEFAULT_PATH_VALUE \
+ ":/c:/gcc:/usr/bin:/bin:/usr/local/bin:.:/local/bin"
+ #else
#define DEFAULT_PATH_VALUE \
":/usr/gnu/bin:/usr/local/bin:/usr/ucb:/bin:/usr/bin:/etc:/usr/etc"
+ #endif /* amigados */
/* The value for PATH when invoking `command -p'. This is only used when
the Posix.2 confstr () function, or CS_PATH define are not present. */
+ #ifdef amigados
+ #define STANDARD_UTILS_PATH \
+ "/c:/gcc:/usr/bin:/bin:/usr/local/bin:.:/local/bin"
+ #else
#define STANDARD_UTILS_PATH \
"/bin:/usr/bin:/usr/ucb:/usr/sbin:/etc:/usr/etc"
+ #endif /* amigados */
/* Define V9_ECHO if you want to give the echo builtin backslash-escape
interpretation using the -e option, in the style of the Bell Labs 9th
***************
*** 137,142 ****
--- 149,174 ----
/* Define DISABLED_BUILTINS if you want "builtin foo" to always run the
shell builtin "foo", even if it has been disabled with "enable -n foo". */
/* #define DISABLED_BUILTINS */
+
+ #ifdef amigados
+ #define SYSTEM_NAME "amiga"
+ #define OS_NAME "amigados"
+ #define PPROMPT "bash$ "
+ #define SPROMPT "> "
+ #ifdef HOSTTYPE
+ # undef HOSTTYPE
+ #endif /* HOSTTYPE */
+ #define HOSTTYPE "amiga"
+ #ifndef MAINTAINER
+ # define MAINTAINER "phb@colombo.telesys-innov.fr"
+ #endif /* MAINTAINER */
+ #ifdef JOB_CONTROL
+ # undef JOB_CONTROL
+ #endif /* JOB_CONTROL */
+ #ifdef HAVE_BSD_SIGNALS
+ # undef HAVE_BSD_SIGNALS
+ #endif
+ #endif /* amigados */
/* Define PROCESS_SUBSTITUTION if you want the K*rn shell-like process
substitution features "<(file)". */
diff -rc bash-1.13.4-fsf/cpp-Makefile bash-1.13.4-amiga/cpp-Makefile
*** bash-1.13.4-fsf/cpp-Makefile Fri Nov 12 15:54:50 1993
--- bash-1.13.4-amiga/cpp-Makefile Sat Nov 20 16:35:05 1993
***************
*** 248,254 ****
$(SIGHANDLER) $(SYSDEP) $(WAITH) $(GETWD) $(DUP2) $(STRERROR) \
$(DIRENT) $(DIRENTH) $(STRINGH) $(VARARGSH) $(STRCHR) $(DEVFD) \
-D$(Machine) -D$(OS)
! DEBUG_FLAGS = $(PROFILE_FLAGS) -O -g
LDFLAGS = $(NOSHARE) $(SYSDEP_LD) $(EXTRA_LD_PATH) $(DEBUG_FLAGS)
CFLAGS = $(DEBUG_FLAGS) $(SYSTEM_FLAGS) -DSHELL $(ALLOCA_CFLAGS) \
$(MALLOC_CFLAGS)
--- 248,254 ----
$(SIGHANDLER) $(SYSDEP) $(WAITH) $(GETWD) $(DUP2) $(STRERROR) \
$(DIRENT) $(DIRENTH) $(STRINGH) $(VARARGSH) $(STRCHR) $(DEVFD) \
-D$(Machine) -D$(OS)
! DEBUG_FLAGS = $(PROFILE_FLAGS) -O
LDFLAGS = $(NOSHARE) $(SYSDEP_LD) $(EXTRA_LD_PATH) $(DEBUG_FLAGS)
CFLAGS = $(DEBUG_FLAGS) $(SYSTEM_FLAGS) -DSHELL $(ALLOCA_CFLAGS) \
$(MALLOC_CFLAGS)
***************
*** 289,295 ****
$(MAKE) $(MFLAGS) CP