diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2019-06-28 23:07:55 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2019-06-28 23:07:55 +0000 |
commit | 11fd0bc3fdbe7b5eb9266a728a81d0bcac91fe32 (patch) | |
tree | 7c40f096dd973943ef563ec87b2a68d8205db4fb /urt/rle_open_f.c | |
parent | 89c6ec14eb7514630aea5abc4b90b51d1473d33a (diff) | |
download | netpbm-mirror-11fd0bc3fdbe7b5eb9266a728a81d0bcac91fe32.tar.gz netpbm-mirror-11fd0bc3fdbe7b5eb9266a728a81d0bcac91fe32.tar.xz netpbm-mirror-11fd0bc3fdbe7b5eb9266a728a81d0bcac91fe32.zip |
Promote Stable to Super_stable
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@3640 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'urt/rle_open_f.c')
-rw-r--r-- | urt/rle_open_f.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/urt/rle_open_f.c b/urt/rle_open_f.c index 07dbea01..ae8548b9 100644 --- a/urt/rle_open_f.c +++ b/urt/rle_open_f.c @@ -15,8 +15,9 @@ #include <unistd.h> #include <fcntl.h> -#include "pm_c_util.h" -#include "nstring.h" +#include "netpbm/pm_c_util.h" +#include "netpbm/nstring.h" +#include "rle_config.h" #include "rle.h" @@ -52,7 +53,7 @@ my_popen(const char * const cmd, return NULL; } - if ( pipe(pipefd) < 0 ) + if (pm_pipe(pipefd) < 0 ) return NULL; /* Flush known files. */ @@ -199,11 +200,11 @@ dealWithSubprocess(const char * const file_name, *noSubprocessP = FALSE; if (*mode == 'w') - asprintfN(&command, "compress > %s", file_name); + pm_asprintf(&command, "compress > %s", file_name); else if (*mode == 'a') - asprintfN(&command, "compress >> %s", file_name); + pm_asprintf(&command, "compress >> %s", file_name); else - asprintfN(&command, "compress -d < %s", file_name); + pm_asprintf(&command, "compress -d < %s", file_name); *fpP = my_popen(command, mode, &thepid); @@ -215,7 +216,7 @@ dealWithSubprocess(const char * const file_name, if (*catchingChildrenP < MAX_CHILDREN) pids[(*catchingChildrenP)++] = thepid; } - strfree(command); + pm_strfree(command); } else { *noSubprocessP = TRUE; *errorP = NULL; @@ -234,7 +235,7 @@ dealWithSubprocess(const char * const file_name, * will return a pointer to stdin or stdout depending on the mode. * If the user specifies a non-null file name and an I/O error occurs * when trying to open the file, rle_open_f will terminate execution with - * an appropiate error message. + * an appropriate error message. * * parameters * input: |