Attachment 1470 Details for Bug 1920 – remove string parsing from compressor call

[patch] remove string parsing from compressor call

WrFFrI-filter-6.8.1.patch (text/plain), 2.46 KB, created by Alex Riesen on 2004-12-04 15:00:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Riesen

Created: 2004-12-04 15:00:31 UTC

Size: 2.46 KB

patch

obsolete

>--- a/xc/extras/Xpm/lib/WrFFrI.c	2004-12-04 23:45:08.408813819 +0100
>+++ b/xc/extras/Xpm/lib/WrFFrI.c	2004-12-04 23:28:42.282557910 +0100
>@@ -39,9 +39,13 @@
>  */
> 
> #include "XpmI.h"
>-#if !defined(NO_ZPIPE) && defined(WIN32)
>-# define popen _popen
>-# define pclose _pclose
>+
>+#ifndef NO_ZPIPE
>+#include "sys/wait.h"
>+#include "sys/types.h"
>+#include "fcntl.h"
>+#include "unistd.h"
>+#include "errno.h"
> #endif
> 
> /* MS Windows define a function called WriteFile @#%#&!!! */
>@@ -297,6 +296,14 @@ WriteExtensions(file, ext, num)
>     fprintf(file, ",\n\"XPMENDEXT\"");
> }
> 
>+
>+#ifndef NO_ZPIPE
>+FUNC(xpmPipeThrough, FILE*, (int fd,
>+			     const char* cmd,
>+			     const char* arg1,
>+			     const char* mode));
>+#endif
>+
> /*
>  * open the given file to be written as an xpmData which is returned
>  */
>@@ -305,38 +312,32 @@ OpenWriteFile(filename, mdata)
>     char *filename;
>     xpmData *mdata;
> {
>-#ifndef NO_ZPIPE
>-    char buf[BUFSIZ];
>-
>-#endif
>-
>     if (!filename) {
> 	mdata->stream.file = (stdout);
> 	mdata->type = XPMFILE;
>     } else {
> #ifndef NO_ZPIPE
>-	int len = strlen(filename);
>+	size_t len;
>+#endif
>+	int fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0644);
>+	if ( fd < 0 )
>+	    return(XpmOpenFailed);
>+#ifndef NO_ZPIPE
>+	len = strlen(filename);
> 	if (len > 2 && !strcmp(".Z", filename + (len - 2))) {
>-	    sprintf(buf, "compress > \"%s\"", filename);
>-	    if (!(mdata->stream.file = popen(buf, "w")))
>-		return (XpmOpenFailed);
>-
>+	    mdata->stream.file = xpmPipeThrough(fd, "compress", NULL, "w");
> 	    mdata->type = XPMPIPE;
> 	} else if (len > 3 && !strcmp(".gz", filename + (len - 3))) {
>-	    sprintf(buf, "gzip -q > \"%s\"", filename);
>-	    if (!(mdata->stream.file = popen(buf, "w")))
>-		return (XpmOpenFailed);
>-
>+	    mdata->stream.file = xpmPipeThrough(fd, "gzip", "-q", "w");
> 	    mdata->type = XPMPIPE;
>-	} else {
>+	} else
> #endif
>-	    if (!(mdata->stream.file = fopen(filename, "w")))
>-		return (XpmOpenFailed);
>-
>+	{
>+	    mdata->stream.file = fdopen(fd, "w");
> 	    mdata->type = XPMFILE;
>-#ifndef NO_ZPIPE
> 	}
>-#endif
>+	if (!mdata->stream.file)
>+	    return (XpmOpenFailed);
>     }
>     return (XpmSuccess);
> }
>@@ -348,15 +349,7 @@ static void
> xpmDataClose(mdata)
>     xpmData *mdata;
> {
>-    switch (mdata->type) {
>-    case XPMFILE:
>-	if (mdata->stream.file != (stdout))
>-	    fclose(mdata->stream.file);
>-	break;
>-#ifndef NO_ZPIPE
>-    case XPMPIPE:
>-	pclose(mdata->stream.file);
>-	break;
>-#endif
>-    }
>+    if (mdata->stream.file != (stdout))
>+	fclose(mdata->stream.file);
> }
>+

Actions: View | Splinter Review

Attachments on bug 1920: 1406 | 1469 | 1470 | 1471 | 1489 | 1490 | 1514 | 1903 | 1908 | 1909

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.