commit bash-20200316 snapshot

examples/loadables/accept.c

@@ -85,7 +85,7 @@ accept_builtin (list)
   if (tmoutarg)
     {
       long ival, uval;
-      opt = uconvert (tmoutarg, &ival, &uval);
+      opt = uconvert (tmoutarg, &ival, &uval, (char **)0);
       if (opt == 0 || ival < 0 || uval < 0)
 	{
 	  builtin_error ("%s: invalid timeout specification", tmoutarg);

examples/loadables/basename.c

@@ -3,7 +3,7 @@
 /* See Makefile for compilation details. */
 
 /*
-   Copyright (C) 1999-2009 Free Software Foundation, Inc.
+   Copyright (C) 1999-2020 Free Software Foundation, Inc.
 
    This file is part of GNU Bash.
    Bash is free software: you can redistribute it and/or modify
@@ -39,15 +39,14 @@ basename_builtin (list)
   int slen, sufflen, off;
   char *string, *suffix, *fn;
 
+  if (no_options (list))
+    return (EX_USAGE);
+  list = loptend;
   if (list == 0)
     {
       builtin_usage ();
       return (EX_USAGE);
-    }
-
-  if (no_options (list))
-    return (EX_USAGE);
-  list = loptend;
+    }    
 
   string = list->word->word;
   suffix = (char *)NULL;

examples/loadables/strftime.c

@@ -34,6 +34,7 @@
 #include "builtins.h"
 #include "shell.h"
 #include "common.h"
+#include "bashgetopt.h"
 
 int
 strftime_builtin (list)
@@ -46,15 +47,16 @@ strftime_builtin (list)
   int n;
   intmax_t i;
 
+  if (no_options (list))
+    return (EX_USAGE);
+  list = loptend;
+
   if (list == 0)
     {
       builtin_usage ();
       return (EX_USAGE);
     }
 
-  if (no_options (list))
-    return (EX_USAGE);
-
   format = list->word->word;
   if (format == 0 || *format == 0)
     {