diff options
Diffstat (limited to 'src/WrFFrI.c')
-rw-r--r-- | src/WrFFrI.c | 85 |
1 files changed, 34 insertions, 51 deletions
diff --git a/src/WrFFrI.c b/src/WrFFrI.c index e5c9b4b..c280641 100644 --- a/src/WrFFrI.c +++ b/src/WrFFrI.c @@ -38,12 +38,14 @@ * Lorens Younes (d93-hyo@nada.kth.se) 4/96 */ -/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ - #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 @#%#&!!! */ @@ -124,7 +126,7 @@ XpmWriteFileFromXpmImage(filename, image, info) /* let's try to make a valid C syntax name */ if (index(name, '.')) { strncpy(new_name, name, sizeof(new_name)); - new_name[sizeof(new_name)-1] = 0; + new_name[sizeof(new_name)-1] = '\0'; /* change '.' to '_' */ name = s = new_name; while ((dot = index(s, '.'))) { @@ -134,8 +136,7 @@ XpmWriteFileFromXpmImage(filename, image, info) } if (index(name, '-')) { if (name != new_name) { - strncpy(new_name, name, sizeof(new_name)); - new_name[sizeof(new_name)-1] = 0; + strcpy(new_name, name); name = new_name; } /* change '-' to '_' */ @@ -252,7 +253,7 @@ WritePixels(file, width, height, cpp, pixels, colors) unsigned int x, y, h; h = height - 1; - if (cpp != 0 && width >= (UINT_MAX - 3)/cpp) + if (cpp != 0 && width >= (UINT_MAX - 3)/cpp) return XpmNoMemory; p = buf = (char *) XpmMalloc(width * cpp + 3); if (!buf) @@ -301,58 +302,48 @@ 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 */ -#ifndef NO_ZPIPE - FILE *s_popen(char *cmd, const char *type); -#else -# define s_popen popen -#endif static int 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 - size_t len = strlen(filename); - - if(len == 0 || - filename[0] == '/' || - strstr(filename, "../") != NULL || - filename[len-1] == '/') - return(XpmOpenFailed); - + 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))) { - snprintf(buf, sizeof(buf), "compress > \"%s\"", filename); - if (!(mdata->stream.file = s_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))) { - snprintf(buf, sizeof(buf), "gzip -q > \"%s\"", filename); - if (!(mdata->stream.file = s_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); } @@ -364,15 +355,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: + if (mdata->stream.file != (stdout)) fclose(mdata->stream.file); - break; -#endif - } } + |