From owner-svn-src-head@freebsd.org Fri Nov 17 19:28:54 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72577DE1942; Fri, 17 Nov 2017 19:28:54 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-io0-f174.google.com (mail-io0-f174.google.com [209.85.223.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8F0D5727F7; Fri, 17 Nov 2017 19:28:53 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-io0-f174.google.com with SMTP id v21so9855331ioi.4; Fri, 17 Nov 2017 11:28:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=ZPyraKOVCXPs7UnJFqT/oMcjbRbgGIdRkT+kWCoHymQ=; b=Jc52E2Bm5CumByyTrR2a5QgGSqMyZjI7L33M/DAeL/tqzgqAeb5rxOAzBb5pmsa0t5 eFOzC/ARlYObvLL1y9dC6AbLzeAvld9cYb+5c7PFNNzXPtm882vwS5v/XuQ8n7soGORw zU2UPnffiLiBGsjVH9r0LO1fj38y2Q33s6Lno7JzDisrNj7FRDxKf6/ZhkswMONqJCsV 9e/k18EpnGzsWV9MdPooxCuenH6gjhG3fBjNPhnYPOMy5zU+g0wMbB4TIShHlwnqjAMo JwzBuGQIWEENZOvDXeFFFCuUFob6apPoKnkRsuUUSeZIMd6CFr3bPplN+Qy28xDGg7k+ SMpQ== X-Gm-Message-State: AJaThX5GSskJpGkF+46RvcsSQy7wiTDWt7Q/T+m25dgNC72BPrNLCgOM ZMvxn+RlvFp+QngoODl3Vok2LoxT X-Google-Smtp-Source: AGs4zMbYysNjZkjOL/OcbQ46My492x9dnME5hkn0/x4UOvGaXvFtYPdL/cKdehKq1Gnr66rdb/kZZQ== X-Received: by 10.107.114.19 with SMTP id n19mr2205907ioc.224.1510945172192; Fri, 17 Nov 2017 10:59:32 -0800 (PST) Received: from mail-it0-f42.google.com (mail-it0-f42.google.com. [209.85.214.42]) by smtp.gmail.com with ESMTPSA id 70sm1916969iok.77.2017.11.17.10.59.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Nov 2017 10:59:31 -0800 (PST) Received: by mail-it0-f42.google.com with SMTP id x28so5232783ita.0; Fri, 17 Nov 2017 10:59:31 -0800 (PST) X-Received: by 10.36.192.2 with SMTP id u2mr7793080itf.119.1510945170924; Fri, 17 Nov 2017 10:59:30 -0800 (PST) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.2.165.150 with HTTP; Fri, 17 Nov 2017 10:59:30 -0800 (PST) In-Reply-To: <201711170933.vAH9XTsl027533@repo.freebsd.org> References: <201711170933.vAH9XTsl027533@repo.freebsd.org> From: Conrad Meyer Date: Fri, 17 Nov 2017 10:59:30 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r325930 - head/sys/contrib/zstd/programs To: Baptiste Daroussin Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Nov 2017 19:28:54 -0000 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 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 */ >