diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-01-27 16:15:45 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-01-27 16:16:23 +0000 |
commit | 9fc73afc00c20648a602f45dc1df4843a9008f9b (patch) | |
tree | 2c070102903504b15e16613ae2fb5debb0740a78 /zdiff.cc | |
parent | Releasing debian version 1.9-1. (diff) | |
download | zutils-9fc73afc00c20648a602f45dc1df4843a9008f9b.tar.xz zutils-9fc73afc00c20648a602f45dc1df4843a9008f9b.zip |
Merging upstream version 1.10.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'zdiff.cc')
-rw-r--r-- | zdiff.cc | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -1,5 +1,5 @@ /* Zdiff - decompress and compare two files line by line - Copyright (C) 2010-2020 Antonio Diaz Diaz. + Copyright (C) 2010-2021 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -116,7 +116,8 @@ extern "C" void remove_fifos() /* Set fifonames[i] to "${TMPDIR}/<coded_pid>[_-]<basename(filenames[i])>" - and create FIFOs. */ + and create FIFOs. The pid is coded in little endian order. +*/ bool set_fifonames( const std::string filenames[2] ) { enum { num_codes = 36 }; @@ -126,13 +127,12 @@ bool set_fifonames( const std::string filenames[2] ) if( p ) { fifonames[0] = p; fifonames[0] += '/'; } else fifonames[0] = "/tmp/"; int n = getpid(); - unsigned pos = fifonames[0].size(); - do fifonames[0].insert( pos, 1, codes[n % num_codes] ); - while( n /= num_codes ); - pos = fifonames[0].size(); + do fifonames[0] += codes[n % num_codes]; while( n /= num_codes ); + const unsigned pos = fifonames[0].size(); + fifonames[0] += '_'; fifonames[1] = fifonames[0]; - fifonames[0] += '_'; fifonames[0] += my_basename( filenames[0].c_str() ); - fifonames[1] += '_'; fifonames[1] += my_basename( filenames[1].c_str() ); + fifonames[0] += my_basename( filenames[0].c_str() ); + fifonames[1] += my_basename( filenames[1].c_str() ); if( fifonames[1] == fifonames[0] ) fifonames[1][pos] = '-'; for( int i = 0; i < 2; ++i ) |