[Winbash-checkins] CVS: winbash/builtins bind.def,1.5,1.6 common.c,1.4,1.5 exec.def,1.4,1.5 exit.def,1.4,1.5 getopt.c,1.4,1.5 getopt.h,1.3,1.4 getopts.def,1.5,1.6 mkbuiltins.c,1.2,1.3 read.def,1.4,1.5 reserved.def,1.3,1.4 set.def,1.3,1.4 source.def,1.4,1.5 trap.def,1.3,1.4 ulimit.def,1.4,1.5

[Enrico B. <enr...@us...>]

Update of /cvsroot/winbash/winbash/builtins
In directory usw-pr-cvs1:/tmp/cvs-serv6262/builtins

Modified Files:
	bind.def common.c exec.def exit.def getopt.c getopt.h 
	getopts.def mkbuiltins.c read.def reserved.def set.def 
	source.def trap.def ulimit.def 
Log Message:
Major realignment to 1.14.7

Index: bind.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/bind.def,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- bind.def	10 Mar 2002 21:45:14 -0000	1.5
+++ bind.def	11 Mar 2002 14:32:13 -0000	1.6
@@ -166,7 +166,7 @@
     {
       if (rl_read_init_file (initfile) != 0)
 	{
- 	  builtin_error ("cannot read %s: %s", initfile, strerror (errno));
+	  builtin_error ("cannot read %s: %s", initfile, strerror (errno));
 	  BIND_RETURN (EXECUTION_FAILURE);
 	}
     }
@@ -181,12 +181,9 @@
       list = list->next;
     }
 
+ bind_exit:
   if (saved_keymap)
     rl_set_keymap (saved_keymap);
-
- bind_exit:
-    if (saved_keymap)
-      rl_set_keymap (saved_keymap);
 
   rl_outstream = old_rl_outstream;
   return (return_code);

Index: common.c
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/common.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- common.c	10 Mar 2002 21:45:14 -0000	1.4
+++ common.c	11 Mar 2002 14:32:13 -0000	1.5
@@ -45,11 +45,11 @@
 #  include "../bashhist.h"
 #endif
 
-extern int no_symbolic_links;
+extern int no_symbolic_links;// interactive, interactive_shell;
 extern int indirection_level, startup_state;
+//extern int last_command_exit_value;
 extern int hashing_disabled;
-/* extern int last_command_exit_value;
- extern int variable_context; */
+//extern int variable_context;
 extern char *this_command_name, *shell_name;
 extern COMMAND *global_command;
 extern HASH_TABLE *hashed_filenames;
@@ -580,7 +580,7 @@
   indirection_level++;
   if (interact != -1)
     interactive = interact;
-  
+
 #if defined (HISTORY)
   /* We don't remember text read by the shell this way on
      the history list, and we don't use !$ in shell scripts. */
@@ -615,15 +615,15 @@
 	      case FORCE_EOF:
 	      case EXITPROG:
 		run_unwind_frame ("pe_dispose");
-		/* Remember to call LONGJMP (top_level) after the old
+		/* Remember to call longjmp (top_level) after the old
 		   value for it is restored. */
 		jump_to_top_level = 1;
 		goto out;
 
 	      case DISCARD:
- 	        dispose_command (command);
-  		run_unwind_frame ("pe_dispose");
- 		last_command_exit_value = 1;
+	        dispose_command (command);
+		run_unwind_frame ("pe_dispose");
+		last_command_exit_value = 1;
 		continue;
 
 	      default:
@@ -673,7 +673,6 @@
   }
 
  out:
-	
 
   run_unwind_frame ("parse_and_execute_top");
 

Index: exec.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/exec.def,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- exec.def	10 Mar 2002 21:45:14 -0000	1.4
+++ exec.def	11 Mar 2002 14:32:13 -0000	1.5
@@ -129,7 +129,7 @@
 
 #if defined (JOB_CONTROL)
       if (subshell_environment == 0)
-      end_job_control ();
+	end_job_control ();
 #endif /* JOB_CONTROL */
 
 #if defined (__NT_VC__)
@@ -153,8 +153,8 @@
 	free (command);
 
       if (subshell_environment ||
-        (!interactive && !find_variable ("no_exit_on_failed_exec")))
-      exit (exit_value);
+	  (!interactive && !find_variable ("no_exit_on_failed_exec")))
+	exit (exit_value);
 
       initialize_traps ();
       reinitialize_signals ();

Index: exit.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/exit.def,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- exit.def	10 Mar 2002 21:45:14 -0000	1.4
+++ exit.def	11 Mar 2002 14:32:13 -0000	1.5
@@ -1,5 +1,5 @@
 This file is exit.def, from which is created exit.c.
-It implements the builtins "exit", and "logout" in Bash.
+It implements the builtins "exit" and "logout" in Bash.
 
 Copyright (C) 1987, 1989, 1991 Free Software Foundation, Inc.
 

Index: getopt.c
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/getopt.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- getopt.c	11 Mar 2002 04:50:29 -0000	1.4
+++ getopt.c	11 Mar 2002 14:32:13 -0000	1.5
@@ -15,19 +15,10 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA.  */
-
-#include <config.h>
-
-#if defined (HAVE_UNISTD_H)
-#  ifdef _MINIX
-#    include <sys/types.h>
-#  endif
-#  include <unistd.h>
-#endif
+   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include <stdio.h>
-#include "memalloc.h"
+#include "../memalloc.h"
 #include "../shell.h"
 #include "getopt.h"
 
@@ -75,9 +66,6 @@
 
 int sh_optopt = '?';
 
-/* Set to 1 when we see an illegal option; public so getopts can reset it. */
-int sh_badopt = 0;
-
 /* Scan elements of ARGV (whose length is ARGC) for option characters
    given in OPTSTRING.
 
@@ -114,11 +102,12 @@
      char *const *argv;
      const char *optstring;
 {
+  int option_index;
   char c, *temp;
 
   sh_optarg = 0;
 
-  if (sh_optind >= argc || sh_optind < 0)	/* XXX was sh_optind > argc */
+  if (sh_optind > argc || sh_optind < 0)
     {
       sh_optind = argc;
       return (EOF);
@@ -135,19 +124,11 @@
       nextchar = (char *)NULL;
     }
 
-  /* Do the increment of `sh_optind' we deferred because the last option
-     was illegal.  */
-  if (sh_badopt && (nextchar == 0 || *nextchar == '\0'))
-    {
-      sh_badopt = 0;
-      sh_optind++;
-      nextchar = (char *)NULL;
-    }
-
   if (nextchar == 0 || *nextchar == '\0')
     {
-      /* If we have done all the ARGV-elements, stop the scan. */
-      if (sh_optind >= argc)
+      /* If we have done all the ARGV-elements, stop the scan
+	 and back over any non-options that we skipped and permuted.  */
+      if (sh_optind == argc)
 	return EOF;
 
       temp = argv[sh_optind];
@@ -177,11 +158,16 @@
   c = *nextchar++; sh_charindex++;
   temp = strchr (optstring, c);
 
+  /* Increment `sh_optind' when we start to process its last character.  */
+  if (nextchar == 0 || *nextchar == '\0')
+    {
+      sh_optind++;
+      nextchar = (char *)NULL;
+    }
+
   sh_optopt = c;
 
-  /* If the option is illegal, return an error, but defer updating sh_optind
-     until the next call so $OPTIND is correct. */
-  if (sh_badopt = (temp == NULL || c == ':'))
+  if (temp == NULL || c == ':')
     {
       if (sh_opterr)
 	BADOPT (c);
@@ -189,13 +175,6 @@
       return '?';
     }
 
-  /* Increment `sh_optind' when we start to process its last character.  */
-  if (nextchar == 0 || *nextchar == '\0')
-    {
-      sh_optind++;
-      nextchar = (char *)NULL;
-    }
-
   if (temp[1] == ':')
     {
       if (nextchar && *nextchar)
@@ -212,7 +191,6 @@
 	    NEEDARG (c);
 
 	  sh_optopt = c;
-	  sh_optarg = "";	/* Needed by getopts. */
 	  c = (optstring[0] == ':') ? ':' : '?';
 	}
       else
@@ -232,19 +210,6 @@
     nextchar = argv[sh_curopt] + sh_charindex;
 }
 
-#if 0
-void
-sh_getopt_debug_restore_state (argv)
-     char **argv;
-{
-  if (nextchar && nextchar != argv[sh_curopt] + sh_charindex)
-    {
-      itrace("sh_getopt_debug_restore_state: resetting nextchar");
-      nextchar = argv[sh_curopt] + sh_charindex;
-    }
-}
-#endif
- 
 #ifdef TEST
 
 /* Compile with -DTEST to make an executable for use in testing

Index: getopt.h
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/getopt.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- getopt.h	11 Mar 2002 01:47:04 -0000	1.3
+++ getopt.h	11 Mar 2002 14:32:14 -0000	1.4
@@ -54,77 +54,4 @@
 extern int sh_getopt ();
 extern void sh_getopt_restore_state ();
 
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
-
-   The field `has_arg' is:
-   no_argument		(or 0) if the option does not take an argument,
-   required_argument	(or 1) if the option requires an argument,
-   optional_argument 	(or 2) if the option takes an optional argument.
-
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
-
-struct option
-{
-#if	__STDC__
-  const char *name;
-#else
-  char *name;
-#endif
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
-#define	no_argument		0
-#define required_argument	1
-#define optional_argument	2
-
-#if __STDC__
-#if defined(__GNU_LIBRARY__)
-/* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in stdlib.h.  To avoid compilation
-   errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-#endif /* not __GNU_LIBRARY__ */
-extern int getopt_long (int argc, char *const *argv, const char *shortopts,
-		        const struct option *longopts, int *longind);
-extern int getopt_long_only (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind);
-
-/* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind,
-			     int long_only);
-#else /* not __STDC__ */
-extern int getopt ();
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-#endif /* not __STDC__ */
-
-#ifdef	__cplusplus
-}
-#endif
-
 #endif /* _GETOPT_H */

Index: getopts.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/getopts.def,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- getopts.def	11 Mar 2002 04:50:29 -0000	1.5
+++ getopts.def	11 Mar 2002 14:32:14 -0000	1.6
@@ -75,13 +75,6 @@
 #define G_ILLEGAL_OPT	(-2)
 #define G_ARG_MISSING	(-3)
 
-/* getopt.c is not compiled if __GNU_LIBRARY__ is defined, so this
-   function will come up as undefined.  More's the pity; the default
-   behavior of the GNU getopt() is not Posix.2 compliant. */
-#if defined (__GNU_LIBRARY__) || defined(__NT_VC__)
-#  define getopt_set_posix_option_order(x)
-#endif
-
 extern char *this_command_name;
 extern WORD_LIST *rest_of_args;
 
@@ -156,6 +149,7 @@
 
   if (argc > 1)
     {
+      sh_getopt_restore_state (argv);
       t = argv[0];
       argv[0] = dollar_vars[0];
       ret = sh_getopt (argc, argv, optstr);
@@ -285,30 +279,23 @@
   register int	i;
   char **av;
   int ac, ret;
-  WORD_LIST *t = list;
-  static int order_set = 0;
+  WORD_LIST *t;
 
-  if (!list)
+  if (list == 0)
     return EXECUTION_FAILURE;
 
-  for (ac = 0; t; t = t->next, ac++);
+  for (t = list, ac = 0; t; t = t->next, ac++);
 
   ac++;
   av = (char **)xmalloc ((1 + ac) * sizeof (char *));
   av[ac] = (char *) NULL;
-  av[0] = savestring (this_command_name);
+  av[0] = this_command_name;
 
   for (t = list, i = 1; t; t = t->next, i++)
-    av[i] = savestring (t->word->word);
-
-  if (order_set == 0)
-    {
-      getopt_set_posix_option_order (1);
-      order_set++;
-    }
+    av[i] = t->word->word;
 
   ret = dogetopts (ac, av);
-  free_array (av);
+  free ((char *)av);
   return (ret);
 }
 #endif /* GETOPTS_BUILTIN */

Index: mkbuiltins.c
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/mkbuiltins.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mkbuiltins.c	9 Mar 2002 04:20:36 -0000	1.2
+++ mkbuiltins.c	11 Mar 2002 14:32:14 -0000	1.3
@@ -25,8 +25,7 @@
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
-#include "posixstat.h"
-#include "filecntl.h"
+#include "../filecntl.h"
 
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>
@@ -220,9 +219,8 @@
       register char *arg;
 
       arg = argv[arg_index++];
-      
-      extract_info (arg, structfile, externfile);
 
+      extract_info (arg, structfile, externfile);
     }
 
   /* Close the files. */

Index: read.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/read.def,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- read.def	11 Mar 2002 01:47:04 -0000	1.4
+++ read.def	11 Mar 2002 14:32:14 -0000	1.5
@@ -31,12 +31,11 @@
 zero, unless end-of-file is encountered.  If the -r option is given,
 this signifies `raw' input, and backslash processing is disabled.
 $END
-#include <stdlib.h>
+
 #include <stdio.h>
 #include "../shell.h"
 #include "nt_types.h"
 #include "common.h"
-#include <errno.h>  
 
 #define issep(c)	(strchr (ifs_chars, (c)) != (char *)0)
 
@@ -107,7 +106,7 @@
 
   input_stream = fdopen (fildes, "r");
 
-      if (!input_stream)
+  if (!input_stream)
     {
       close (fildes);
       return (EXECUTION_FAILURE);
@@ -137,22 +136,22 @@
       /* If the next character is to be accepted verbatim, a backslash
 	 newline pair still disappears from the input. */
       if (pass_next)
-	  {
-	    if (c == '\n')
-	      i--;		/* back up over the CTLESC */
-	    else
-	      input_string[i++] = c;
-	    pass_next = 0;
-	    continue;
-	  }
+	{
+	  if (c == '\n')
+	    i--;		/* back up over the CTLESC */
+	  else
+	    input_string[i++] = c;
+	  pass_next = 0;
+	  continue;
+	}
 
       if (c == '\\' && !raw_mode)
-	  {
-	    pass_next++;
-	    saw_escape++;
-	    input_string[i++] = CTLESC;
-	    continue;
-	  }
+	{
+	  pass_next++;
+	  saw_escape++;
+	  input_string[i++] = CTLESC;
+	  continue;
+	}
 
       if (c == '\n')
 	  {
@@ -189,13 +188,13 @@
   if (!list)
     {
       if (saw_escape)
-	    {
-	      t = dequote_string (input_string);
-	      var = bind_variable ("REPLY", t);
-	      free (t);
-	    }
+	{
+	  t = dequote_string (input_string);
+	  var = bind_variable ("REPLY", t);
+	  free (t);
+	}
       else
-	    var = bind_variable ("REPLY", input_string);
+	var = bind_variable ("REPLY", input_string);
       var->attributes &= ~att_invisible;
       free (input_string);
     }
@@ -205,24 +204,24 @@
 	 read and assigning them to variables.  If $IFS is unset, we
 	 use the default value of " \t\n". */
       orig_input_string = input_string;
- 
-       /* Remove IFS white space at the beginning of the input string.  If
- 	 $IFS is null, no field splitting is performed. */
-       for (t = input_string; *ifs_chars && spctabnl (*t) && issep (*t); t++)
- 	;
-       input_string = t;
- 
-       for (; list->next; list = list->next)
+
+      /* Remove IFS white space at the beginning of the input string.  If
+	 $IFS is null, no field splitting is performed. */
+      for (t = input_string; *ifs_chars && spctabnl (*t) && issep (*t); t++)
+	;
+      input_string = t;
+
+      for (; list->next; list = list->next)
 	{
 	  char *e, *t1;
 
 	  varname = list->word->word;
- 	  if (legal_identifier (varname) == 0)
- 	    {
- 	      builtin_error ("%s: not a legal variable name", varname);
- 	      free (orig_input_string);
- 	      return (EXECUTION_FAILURE);
- 	    }
+	  if (legal_identifier (varname) == 0)
+	    {
+	      builtin_error ("%s: not a legal variable name", varname);
+	      free (orig_input_string);
+	      return (EXECUTION_FAILURE);
+	    }
 
 	  /* If there are more variables than words read from the input,
 	     the remaining variables are set to the empty string. */
@@ -231,17 +230,17 @@
 	      /* This call updates INPUT_STRING. */
 	      t = get_word_from_string (&input_string, ifs_chars, &e);
 	      if (t)
-		    *e = '\0';
+		*e = '\0';
 	      /* Don't bother to remove the CTLESC unless we added one
 		 somewhere while reading the string. */
 	      if (t && saw_escape)
-		    {
-		      t1 = dequote_string (t);
-		      var = bind_variable (varname, t1);
-		      free (t1);
-		    }
+		{
+		  t1 = dequote_string (t);
+		  var = bind_variable (varname, t1);
+		  free (t1);
+		}
 	      else
-		    var = bind_variable (varname, t);
+		var = bind_variable (varname, t);
 	    }
 	  else
 	    {
@@ -257,11 +256,11 @@
 	}
 
       if (legal_identifier (list->word->word) == 0)
-      {
- 	 builtin_error ("%s: not a legal variable name", list->word->word);
- 	 free (orig_input_string);
- 	 return (EXECUTION_FAILURE);
-      }
+	{
+	  builtin_error ("%s: not a legal variable name", list->word->word);
+	  free (orig_input_string);
+	  return (EXECUTION_FAILURE);
+	}
 
       /* This has to be done this way rather than using string_list
 	 and list_string because Posix.2 says that the last variable gets the
@@ -270,13 +269,13 @@
 						      saw_escape);
 
       if (saw_escape)
-	    {
-	      t = dequote_string (input_string);
-          var = bind_variable (list->word->word, t);
-          free (t);
-        }
+	{
+	  t = dequote_string (input_string);
+	  var = bind_variable (list->word->word, t);
+	  free (t);
+	}
       else
-	    var = bind_variable (list->word->word, input_string);
+	var = bind_variable (list->word->word, input_string);
       stupidly_hack_special_variables (list->word->word);
       var->attributes &= ~att_invisible;
       free (orig_input_string);

Index: reserved.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/reserved.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- reserved.def	9 Mar 2002 16:05:42 -0000	1.3
+++ reserved.def	11 Mar 2002 14:32:14 -0000	1.4
@@ -42,7 +42,7 @@
 in the variable REPLY.  COMMANDS are executed after each selection
 until a break or return command is executed.
 $END
- 
+
 $BUILTIN case
 $SHORT_DOC case WORD in [PATTERN [| PATTERN]...) COMMANDS ;;]... esac
 Selectively execute COMMANDS based upon WORD matching PATTERN.  The

Index: set.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/set.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- set.def	10 Mar 2002 21:45:14 -0000	1.3
+++ set.def	11 Mar 2002 14:32:14 -0000	1.4
@@ -30,8 +30,7 @@
 
 extern int noclobber, no_brace_expansion, posixly_correct;
 #if defined (READLINE)
-extern int rl_editing_mode;
-/*extern int no_line_editing;*/
+extern int rl_editing_mode; //, no_line_editing;
 #endif /* READLINE */
 
 #define USAGE_STRING "set [--abefhknotuvxldHCP] [-o option] [arg ...]"
@@ -60,7 +59,9 @@
             emacs        use an emacs-style line editing interface
 #endif /* READLINE */
             errexit      same as -e
+#if defined (BANG_HISTORY)
             histexpand   same as -H
+#endif /* BANG_HISTORY */
             ignoreeof    the shell will not exit upon reading EOF
             interactive-comments
                          allow comments to appear in interactive commands
@@ -117,7 +118,9 @@
 } o_options[] = {
   { "allexport",  'a' },
   { "errexit",	  'e' },
+#if defined (BANG_HISTORY)
   { "histexpand", 'H' },
+#endif /* BANG_HISTORY */
   { "monitor",	  'm' },
   { "noexec",	  'n' },
   { "noglob",	  'f' },

Index: source.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/source.def,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- source.def	10 Mar 2002 21:45:14 -0000	1.4
+++ source.def	11 Mar 2002 14:32:14 -0000	1.5
@@ -30,7 +30,7 @@
 $BUILTIN .
 $DOCNAME dot
 $FUNCTION source_builtin
-$SHORT_DOC . [filename]
+$SHORT_DOC . filename
 Read and execute commands from FILENAME and return.  The pathnames
 in $PATH are used to find the directory containing FILENAME.
 $END
@@ -128,7 +128,10 @@
 
 	  /* POSIX shells exit if non-interactive and file error. */
 	  if (posixly_correct && !interactive_shell)
-	    longjmp (top_level, EXITPROG);
+	    {
+	      last_command_exit_value = 1;
+	      longjmp (top_level, EXITPROG);
+	    }
 
 	  return (EXECUTION_FAILURE);
 	}

Index: trap.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/trap.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- trap.def	10 Mar 2002 21:45:14 -0000	1.3
+++ trap.def	11 Mar 2002 14:32:14 -0000	1.4
@@ -155,15 +155,15 @@
 		      {
 		      case SIGINT:
 			if (interactive)
-			  signal (SIGINT, sigint_sighandler);
+			  set_signal_handler (SIGINT, sigint_sighandler);
 			else
-			  signal (SIGINT, termination_unwind_protect);
+			  set_signal_handler (SIGINT, termination_unwind_protect);
 			break;
 
 #ifdef SIGQUIT
 		      case SIGQUIT:
 			/* Always ignore SIGQUIT. */
-			signal (SIGQUIT, SIG_IGN);
+			set_signal_handler (SIGQUIT, SIG_IGN);
 			break;
 #endif
 		      case SIGTERM:
@@ -173,7 +173,7 @@
 		      case SIGTSTP:
 #endif /* JOB_CONTROL */
 			if (interactive)
-			  signal (sig, SIG_IGN);
+			  set_signal_handler (sig, SIG_IGN);
 			break;
 		      }
 		    break;

Index: ulimit.def
===================================================================
RCS file: /cvsroot/winbash/winbash/builtins/ulimit.def,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ulimit.def	10 Mar 2002 15:54:11 -0000	1.4
+++ ulimit.def	11 Mar 2002 14:32:14 -0000	1.5
@@ -86,7 +86,7 @@
 #if !defined (RLIMTYPE)
 #  define RLIMTYPE long
 #  define string_to_rlimtype string_to_long
-#  define print_rlimtype(n, nl) printf ("%ld%s", n, nl ? "\n" : "")
+#  define print_rlimtype(num, nl) printf ("%ld%s", num, nl ? "\n" : "")
 #endif
 
 static void print_long ();
@@ -443,8 +443,14 @@
 #endif /* USGr4 */
 
     case u_CPU_TIME_LIMIT:
+#if defined (RLIMIT_CPU)
       cmd = RLIMIT_CPU;
       goto do_ulimit;
+#else
+      errno = EINVAL;
+      return ((RLIMTYPE)-1);
+#  endif /* !RLIMIT_CPU */
+
 
     case u_STACK_SIZE:
       cmd = RLIMIT_STACK;
@@ -633,7 +639,9 @@
   { u_PHYS_MEM_SIZE,  RLIMIT_RSS,   1024, "max memory size (kbytes)" },
 #endif /* USGr4 && RLIMIT_RSS */
   { u_STACK_SIZE,     RLIMIT_STACK, 1024, "stack size (kbytes)" },
+#if defined (RLIMIT_CPU)
   { u_CPU_TIME_LIMIT, RLIMIT_CPU,      1, "cpu time (seconds)" },
+#endif /* RLIMIT_CPU */
 #if defined (RLIMIT_NPROC)
   { u_MAX_USER_PROCS, RLIMIT_NPROC,    1, "max user processes" },
 #endif /* RLIMIT_NPROC */