- merge 0.7rc1 from b_devel to HEAD (20030612 merge point)

[fs/lustre-release.git] / lustre / tests / runas.c

diff --git a/lustre/tests/runas.c b/lustre/tests/runas.c
index 3d29f1b..8731699 100644 (file)
--- a/lustre/tests/runas.c
+++ b/lustre/tests/runas.c
@@ -19,7 +19,7 @@ Usage_and_abort()
        exit(-1);
 }
 
-// Usage: runas -u user_id [ -g grp_id ] "command_to_be_run"
+// Usage: runas -u user_id [ -g grp_id ] [--] command_to_be_run
 // return: the return value of "command_to_be_run"
 // NOTE: returning -1 might be the return code of this program itself or
 // the "command_to_be_run"
@@ -30,8 +30,7 @@ Usage_and_abort()
 int 
 main(int argc, char**argv)
 {
-        char command[1024];
-        char *cmd_ptr;
+        char **my_argv;
         int status;
         int c,i;
         int gid_is_set = 0;
@@ -44,7 +43,7 @@ main(int argc, char**argv)
         }
 
         // get UID and GID
-        while ((c = getopt (argc, argv, "u:g:h")) != -1) {
+        while ((c = getopt (argc, argv, "+u:g:h")) != -1) {
                 switch (c) {
                 case 'u':
                         user_id = (uid_t)atoi(optarg);
@@ -79,12 +78,18 @@ main(int argc, char**argv)
                 Usage_and_abort();
         }
 
-
         // assemble the command
-        cmd_ptr = command ;
-        for (i = optind; i < argc; i++)
-                 cmd_ptr += sprintf(cmd_ptr,  "%s ", argv[i]);
-
+        my_argv = (char**)malloc(sizeof(char*)*(argc+1-optind));
+               if(my_argv == NULL) {
+                       fprintf(stderr, "Error in allocating memory. (%s)\n", strerror(errno));
+                               exit(-1);
+               }
+               
+        for(i=optind; i< argc; i++) {
+                my_argv[i-optind] = argv[i];
+//                printf("%s\n",my_argv[i-optind]);
+        }
+        my_argv[i-optind]=NULL;
 
 #if DEBUG
   system("whoami");
@@ -94,7 +99,7 @@ main(int argc, char**argv)
         status = setregid(grp_id, grp_id );
         if( status == -1) {
                  fprintf(stderr, "Cannot change grp_ID to %d, errno=%d (%s)\n",
-                  grp_id, errno, strerror(errno) );
+                          grp_id, errno, strerror(errno) );
                  exit(-1);
         }
 
@@ -102,32 +107,24 @@ main(int argc, char**argv)
         status = setreuid(user_id, user_id );
         if(status == -1) {
                   fprintf(stderr,"Cannot change user_ID to %d, errno=%d (%s)\n",
-                   user_id, errno, strerror(errno) );
+                           user_id, errno, strerror(errno) );
                   exit(-1);
         }
 
-#if DEBUG
-  system("whoami");
-#endif
 
-        fprintf(stdout, "running as USER(%d), Grp (%d):  \"%s\" \n", 
-           user_id, grp_id, command );
+        fprintf(stderr, "running as USER(%d), Grp (%d):  ", 
+           user_id, grp_id );
 
-        // run the command
-        status = system(command);
+        for(i=0; i<argc-optind; i++)
+                 fprintf(stderr, " [%s]", my_argv[i]);
 
-        // pass the return code of command_to_be_run out of this wrapper
-        if (status == -1) {
-                 fprintf(stderr, "%s: system() command failed to run\n",
-                           argv[0]);
-        }
-        else{
-                 status = WEXITSTATUS(status);
-                 fprintf(stderr, "[%s #%d] \"%s\" returns %d (%s).\n", argv[0],
-                        user_id, argv[optind], status, strerror(status));
+        fprintf(stderr, "\n");
+        fflush(stderr);
 
-        }
+        // The command to be run
+        execvp(my_argv[0], my_argv);
+        fprintf(stderr, "execvp fails running %s\n", my_argv[0]);
+        exit(-1);
 
-        return(status);
 }