X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=builtins%2Fsource.def;h=1bb3e7315ef1289f99cb267a32bfcbbad18f00f7;hb=ccc6cda312fea9f0468ee65b8f368e9653e1380b;hp=895e98bde023e93398dc7b274a22601b259ba63d;hpb=726f63884db0132f01745f1fb4465e6621088ccf;p=platform%2Fupstream%2Fbash.git

diff --git a/builtins/source.def b/builtins/source.def
index 895e98b..1bb3e73 100644
--- a/builtins/source.def
+++ b/builtins/source.def
@@ -36,34 +36,34 @@ in $PATH are used to find the directory containing FILENAME.
 $END
 /* source.c - Implements the `.' and `source' builtins. */
 
-#include <sys/types.h>
+#include <config.h>
+
+#include "../bashtypes.h"
+#include "../posixstat.h"
+#include "../filecntl.h"
 #include <sys/file.h>
 #include <errno.h>
 
-#if defined (HAVE_STRING_H)
-#  include <string.h>
-#else /* !HAVE_STRING_H */
-#  include <strings.h>
-#endif /* !HAVE_STRING_H */
+#if defined (HAVE_UNISTD_H)
+#  include <unistd.h>
+#endif
+
+#include "../bashansi.h"
 
 #include "../shell.h"
-#include "../posixstat.h"
-#include "../filecntl.h"
 #include "../execute_cmd.h"
+#include "common.h"
 
-/* Not all systems declare ERRNO in errno.h... and some systems #define it! */
 #if !defined (errno)
 extern int errno;
 #endif /* !errno */
 
-/* Variables used here but defined in other files. */
-extern int return_catch_flag, return_catch_value;
-extern jmp_buf return_catch;
-extern int posixly_correct;
-extern int interactive, interactive_shell, last_command_exit_value;
+#if defined (RESTRICTED_SHELL)
+extern int restricted;
+#endif
 
-/* How many `levels' of sourced files we have. */
-int sourcelevel = 0;
+/* If non-zero, `.' uses $PATH to look up the script to be sourced. */
+int source_uses_path = 1;
 
 /* If this . script is supplied arguments, we save the dollar vars and
    replace them with the script arguments for the duration of the script's
@@ -86,101 +86,51 @@ maybe_pop_dollar_vars ()
    This cannot be done in a subshell, since things like variable assignments
    take place in there.  So, I open the file, place it into a large string,
    close the file, and then execute the string. */
+int
 source_builtin (list)
      WORD_LIST *list;
 {
-  int result, return_val;
-
-  /* Assume the best. */
-  result = EXECUTION_SUCCESS;
+  int result;
+  char *filename;
 
-  if (list)
+  if (list == 0)
     {
-      char *string, *filename;
-      struct stat finfo;
-      int fd, tt;
-
-      filename = find_path_file (list->word->word);
-      if (!filename)
-	filename = savestring (list->word->word);
-
-      if (((fd = open (filename, O_RDONLY)) < 0) || (fstat (fd, &finfo) < 0))
-	goto file_error_exit;
-
-      string = (char *)xmalloc (1 + (int)finfo.st_size);
-      tt = read (fd, string, finfo.st_size);
-      string[finfo.st_size] = '\0';
-
-      /* Close the open file, preserving the state of errno. */
-      { int temp = errno; close (fd); errno = temp; }
-
-      if (tt != finfo.st_size)
-	{
-	  free (string);
-
-	file_error_exit:
-	  file_error (filename);
-	  free (filename);
-
-	  /* POSIX shells exit if non-interactive and file error. */
-	  if (posixly_correct && !interactive_shell)
-	    {
-	      last_command_exit_value = 1;
-	      longjmp (top_level, EXITPROG);
-	    }
-
-	  return (EXECUTION_FAILURE);
-	}
-
-      if (tt > 80)
-	tt = 80;
-
-      if (check_binary_file ((unsigned char *)string, tt))
-	{
-	  free (string);
-	  builtin_error ("%s: cannot execute binary file", filename);
-	  free (filename);
-	  return (EX_BINARY_FILE);
-	}
-
-      begin_unwind_frame ("File Sourcing");
-
-      if (list->next)
-	{
-	  push_dollar_vars ();
-	  add_unwind_protect ((Function *)maybe_pop_dollar_vars, (char *)NULL);
-	  remember_args (list->next, 1);
-	}
-
-      unwind_protect_int (return_catch_flag);
-      unwind_protect_jmp_buf (return_catch);
-      unwind_protect_int (interactive);
-      unwind_protect_int (sourcelevel);
-      add_unwind_protect ((Function *)xfree, filename);
-      interactive = 0;
-      sourcelevel++;
+      builtin_error ("filename argument required");
+      builtin_usage ();
+      return (EX_USAGE);
+    }
 
-      set_dollar_vars_unchanged ();
+  if (no_options (list))
+    return (EX_USAGE);
 
-      return_catch_flag++;
-      return_val = setjmp (return_catch);
+#if defined (RESTRICTED_SHELL)
+  if (restricted && strchr (list->word->word, '/'))
+    {
+      builtin_error ("%s: restricted", list->word->word);
+      return (EXECUTION_FAILURE);
+    }
+#endif
 
-      if (return_val)
-	parse_and_execute_cleanup ();
-      else
-	result = parse_and_execute (string, filename, -1);
+  filename = (char *)NULL;
+  if (source_uses_path)
+    filename = find_path_file (list->word->word);
+  if (filename == 0)
+    filename = savestring (list->word->word);
 
-      run_unwind_frame ("File Sourcing");
+  begin_unwind_frame ("source");
+  add_unwind_protect ((Function *)xfree, filename);
 
-      /* If RETURN_VAL is non-zero, then we return the value given
-	 to return_builtin (), since that is how we got here. */
-      if (return_val)
-	result = return_catch_value;
-    }
-  else
+  if (list->next)
     {
-      builtin_error ("filename argument required");
-      result = EXECUTION_FAILURE;
+      push_dollar_vars ();
+      add_unwind_protect ((Function *)maybe_pop_dollar_vars, (char *)NULL);
+      remember_args (list->next, 1);
     }
+  set_dollar_vars_unchanged ();
+
+  result = source_file (filename);
+
+  run_unwind_frame ("source");
+
   return (result);
 }