Changeset 454 for trunk/server/source3/lib/smbrun.c

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

File:

• trunk/server/source3/lib/smbrun.c (modified) (2 diffs)

trunk/server/source3/lib/smbrun.c

@@ -83 +83 @@
         }
 
+#ifdef __OS2__
+                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 */
@@ -202 +230 @@
         exit(83);
         return 1;
+#endif
 }