From 28fd9848f90b54e812d9d3efe7a9d30edb64a6ad Mon Sep 17 00:00:00 2001 From: Moinak Ghosh Date: Thu, 10 Oct 2013 21:19:44 +0530 Subject: [PATCH] Ability to specify output compressed pathname. Fix log level handling. Trim commented code. --- README.md | 8 ++++--- pcompress.c | 66 +++++++++++++++++++++++++++++++++++++-------------- utils/utils.c | 33 +------------------------- 3 files changed, 54 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index 6762e1f..e10bd77 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Usage ===== To compress a file: - pcompress -c [-l ] [-s ] [-] + pcompress -c [-l ] [-s ] [] Where can be the folowing: lzfx - Very fast and small algorithm based on LZF. @@ -90,8 +90,10 @@ Usage just a hint and may get automatically adjusted. - Can be a number from 0 meaning minimum and 14 meaning maximum compression. - '-' - If '-' is given as the final argument then it specifies that - compressed output should go to stdout. + - Optional argument specifying the destination compressed + file. The '.pz' extension is appended. If this is '-' then + compressed output goes to stdout. If this argument is omitted then + source filename is used with the extension '.pz' appended. NOTE: The option "libbsc" uses Ilya Grebnov's block sorting compression library from http://libbsc.com/ . It is only available if pcompress in built with diff --git a/pcompress.c b/pcompress.c index a6a958e..e974fbb 100644 --- a/pcompress.c +++ b/pcompress.c @@ -85,7 +85,7 @@ usage(pc_ctx_t *pctx) "\nPcompress Version %s\n\n" "Usage:\n" "1) To compress a file:\n" - " %s -c [-l ] [-s ] \n" + " %s -c [-l ] [-s ] []\n" " Where can be the folowing:\n" " lzfx - Very fast and small algorithm based on LZF.\n" " lz4 - Ultra fast, high-throughput algorithm reaching RAM B/W at level1.\n" @@ -115,6 +115,10 @@ usage(pc_ctx_t *pctx) " Larger chunks produce better compression at the cost of memory.\n" " - Can be a number from 0 meaning minimum and 14 meaning\n" " maximum compression.\n\n" + " - Optional argument specifying the destination compressed\n" + " file. The '.pz' extension is appended. If this is '-' then\n" + " compressed output goes to stdout. If this argument is omitted then\n" + " source filename is used with the extension '.pz' appended.\n" "2) To decompress a file compressed using above command:\n" " %s -d \n" "3) To operate as a pipe, read from stdin and write to stdout:\n" @@ -1882,13 +1886,22 @@ start_compress(pc_ctx_t *pctx, const char *filename, uint64_t chunksize, int lev COMP_BAIL; } } else { - strcat(tmpfile1, "/.pcompXXXXXX"); - snprintf(to_filename, sizeof (to_filename), "%s" COMP_EXTN, filename); - if ((compfd = mkstemp(tmpfile1)) == -1) { - perror("mkstemp "); - COMP_BAIL; + if (pctx->to_filename == NULL) { + strcat(tmpfile1, "/.pcompXXXXXX"); + snprintf(to_filename, sizeof (to_filename), "%s" COMP_EXTN, filename); + if ((compfd = mkstemp(tmpfile1)) == -1) { + perror("mkstemp "); + COMP_BAIL; + } + add_fname(tmpfile1); + } else { + snprintf(to_filename, sizeof (to_filename), "%s" COMP_EXTN, pctx->to_filename); + if ((compfd = open(to_filename, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) == -1) { + perror("open "); + COMP_BAIL; + } + add_fname(to_filename); } - add_fname(tmpfile1); } signal(SIGINT, Int_Handler); signal(SIGTERM, Int_Handler); @@ -2369,12 +2382,17 @@ comp_done: fchmod(compfd, sbuf.st_mode); if (fchown(compfd, sbuf.st_uid, sbuf.st_gid) == -1) perror("chown "); + close(compfd); - if (rename(tmpfile1, to_filename) == -1) { - perror("Cannot rename temporary file "); - unlink(tmpfile1); + if (pctx->to_filename == NULL) { + if (rename(tmpfile1, to_filename) == -1) { + perror("Cannot rename temporary file "); + unlink(tmpfile1); + } + rm_fname(tmpfile1); + } else { + rm_fname(to_filename); } - rm_fname(tmpfile1); } } if (dary != NULL) { @@ -2823,19 +2841,31 @@ init_pc_context(pc_ctx_t *pctx, int argc, char *argv[]) if (*(argv[my_optind]) == '-') { pctx->to_filename = "-"; pctx->pipe_out = 1; + pctx->to_filename = NULL; + } else { + strcpy(apath, argv[my_optind]); + strcat(apath, COMP_EXTN); + pctx->to_filename = realpath(apath, NULL); + + /* Check if compressed file exists */ + if (pctx->to_filename != NULL) { + log_msg(LOG_ERR, 0, "Compressed file %s exists\n", pctx->to_filename); + free((void *)(pctx->to_filename)); + return (1); + } + pctx->to_filename = argv[my_optind]; } - pctx->to_filename = realpath(argv[my_optind], NULL); } else { strcpy(apath, pctx->filename); strcat(apath, COMP_EXTN); pctx->to_filename = realpath(apath, NULL); - } - /* Check if compressed file exists */ - if (pctx->to_filename != NULL) { - log_msg(LOG_ERR, 0, "Compressed file %s exists\n", pctx->to_filename); - free((void *)(pctx->to_filename)); - return (1); + /* Check if compressed file exists */ + if (pctx->to_filename != NULL) { + log_msg(LOG_ERR, 0, "Compressed file %s exists\n", pctx->to_filename); + free((void *)(pctx->to_filename)); + return (1); + } } } else if (pctx->do_uncompress && num_rem == 2) { /* diff --git a/utils/utils.c b/utils/utils.c index 05ac8f7..0a028b5 100644 --- a/utils/utils.c +++ b/utils/utils.c @@ -57,37 +57,6 @@ init_pcompress() { XXH32_module_init(); } -/* -void -err_exit(int show_errno, const char *format, ...) -{ - int err = errno; - va_list args; - - va_start(args, format); - vfprintf(stderr, format, args); - va_end(args); - - if (show_errno) - fprintf(stderr, "\nError: %s\n", strerror(err)); - exit(1); -} - -void -err_print(int show_errno, const char *format, ...) -{ - int err = errno; - va_list args; - - va_start(args, format); - vfprintf(stderr, format, args); - va_end(args); - - if (show_errno) - fprintf(stderr, "\nError: %s\n", strerror(err)); -} -*/ - /* * Fetch the command name that started the current process. * The returned string must be freed by the caller. @@ -475,7 +444,7 @@ log_msg(log_level_t log_level, int show_errno, const char *format, ...) va_list args; char msg[1024]; - if (log_level <= cur_log_level) return; + if (log_level > cur_log_level) return; va_start(args, format); written = vsnprintf(msg, 1024, format, args);