Changeset 60

Timestamp:

Aug 20, 2007, 10:20:30 PM (18 years ago)

Author:

Yuri Dario

Message:

Use popen() for executing scripts, so .cmd/.exe/.sh scripts are supported. Fixes ticket:12 (and probably also ticket:26).

Location:

trunk/samba/source/lib

Files:

• smbrun.c (modified) (2 diffs)
• util_str.c (modified) (1 diff)

trunk/samba/source/lib/smbrun.c

@@ -74 +74 @@
         }
 
+#ifdef __EMX__
+
+        {
+                char buf[8192];
+                int     n, w;
+                const char *newcmd = sanitize ? escape_shell_string(cmd) : cmd;
+                if (!newcmd) {
+                        close(*outfd);
+                        *outfd = -1;
+                        return(82);
+                }
+                // execute script and capture stdout
+                FILE* pipe = popen( newcmd, "rb");
+                if (pipe) {
+                        // get stdout from pipe
+                        while( !feof( pipe)) {
+                                n = fread( buf, 1, 8192, pipe);
+                                // write to file if required
+                                if (n>0 && outfd!=NULL)
+                                        w = write( *outfd, buf, n);
+                        }
+                        // close and return status
+                        pclose( pipe);
+                        return 0;
+                }
+                // error, close files
+                close(*outfd);
+                *outfd = -1;
+                return 83;
+        }
+
+#else
+
         /* in this method we will exec /bin/sh with the correct
            arguments, after first setting stdout to point at the file */
@@ -185 +218 @@
         exit(83);
         return 1;
+
+#endif // __EMX__
+
 }
 

trunk/samba/source/lib/util_str.c

@@ -2623 +2623 @@
 *******************************************************************/
 
-#define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_/ \t.,"
+#define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_/ \t.,:"
 #define INSIDE_DQUOTE_LIST "$`\n\"\\"