svn commit: r325930 - head/sys/contrib/zstd/programs

[Conrad Meyer]

Hi Bapt,

I don't think this is a sufficient fix.  Our zstd is still deleting
source files, differing from upstream for no reason.

Best,
Conrad

On Fri, Nov 17, 2017 at 1:33 AM, Baptiste Daroussin <bapt at freebsd.org> wrote:
> Author: bapt
> Date: Fri Nov 17 09:33:29 2017
> New Revision: 325930
> URL: https://svnweb.freebsd.org/changeset/base/325930
>
> Log:
>   Actually commit the right patch for r325929
>
> Modified:
>   head/sys/contrib/zstd/programs/zstdcli.c
>
> Modified: head/sys/contrib/zstd/programs/zstdcli.c
> ==============================================================================
> --- head/sys/contrib/zstd/programs/zstdcli.c    Fri Nov 17 09:29:26 2017        (r325929)
> +++ head/sys/contrib/zstd/programs/zstdcli.c    Fri Nov 17 09:33:29 2017        (r325930)
> @@ -421,7 +421,7 @@ int main(int argCount, const char* argv[])
>      /* preset behaviors */
>      if (exeNameMatch(programName, ZSTD_ZSTDMT)) nbThreads=0;
>      if (exeNameMatch(programName, ZSTD_UNZSTD)) operation=zom_decompress;
> -    if (exeNameMatch(programName, ZSTD_CAT)) { operation=zom_decompress; forceStdout=1; FIO_overwriteMode(); outFileName=stdoutmark; g_displayLevel=1; g_removeSrcFile=0; }
> +    if (exeNameMatch(programName, ZSTD_CAT)) { operation=zom_decompress; forceStdout=1; FIO_overwriteMode(); outFileName=stdoutmark; g_displayLevel=1; FIO_setRemoveSrcFile(0); }
>      if (exeNameMatch(programName, ZSTD_GZ)) { suffix = GZ_EXTENSION; FIO_setCompressionType(FIO_gzipCompression); FIO_setRemoveSrcFile(1); }    /* behave like gzip */
>      if (exeNameMatch(programName, ZSTD_GUNZIP)) { operation=zom_decompress; FIO_setRemoveSrcFile(1); }                                          /* behave like gunzip */
>      if (exeNameMatch(programName, ZSTD_GZCAT)) { operation=zom_decompress; forceStdout=1; FIO_overwriteMode(); outFileName=stdoutmark; g_displayLevel=1; }  /* behave like gzcat */
>