From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Ruijie Yu via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#61326: Adding --no-add-suffix to zip patch Date: Tue, 7 Feb 2023 09:31:11 +0800 Message-ID: <8574C128-9560-490A-88E6-49E415BBDB24@netyu.xyz> References: <87ilgeoc4w.fsf@tullinup.koldfront.dk> Reply-To: Ruijie Yu Mime-Version: 1.0 (1.0) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21021"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 61326@debbugs.gnu.org To: Adam =?UTF-8?Q?Sj=C3=B8gren?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Feb 07 02:32:30 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pPCqU-0005H8-Fk for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 07 Feb 2023 02:32:30 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPCq9-0005RE-A0; Mon, 06 Feb 2023 20:32:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPCq2-0005Qu-Bh for bug-gnu-emacs@gnu.org; Mon, 06 Feb 2023 20:32:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pPCq2-0001s4-15 for bug-gnu-emacs@gnu.org; Mon, 06 Feb 2023 20:32:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pPCq1-0003tm-JS for bug-gnu-emacs@gnu.org; Mon, 06 Feb 2023 20:32:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Ruijie Yu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 07 Feb 2023 01:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61326 X-GNU-PR-Package: emacs Original-Received: via spool by 61326-submit@debbugs.gnu.org id=B61326.167573351314973 (code B ref 61326); Tue, 07 Feb 2023 01:32:01 +0000 Original-Received: (at 61326) by debbugs.gnu.org; 7 Feb 2023 01:31:53 +0000 Original-Received: from localhost ([127.0.0.1]:50493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPCps-0003tR-VT for submit@debbugs.gnu.org; Mon, 06 Feb 2023 20:31:53 -0500 Original-Received: from netyu.xyz ([152.44.41.246]:51552 helo=mail.netyu.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPCpr-0003tJ-Dm for 61326@debbugs.gnu.org; Mon, 06 Feb 2023 20:31:52 -0500 Original-Received: from smtpclient.apple ( [36.249.106.224]) by netyu.xyz (OpenSMTPD) with ESMTPSA id f81ccfe2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 7 Feb 2023 01:31:50 +0000 (UTC) In-Reply-To: <87ilgeoc4w.fsf@tullinup.koldfront.dk> X-Mailer: iPhone Mail (20D47) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:255005 Archived-At: On Feb 7, 2023, at 02:58, Adam Sj=C3=B8gren via Bug reports for GNU Emacs, t= he Swiss army knife of text editors wrote: >=20 > =EF=BB=BFAdding a '--no-add-suffix' option to zip 3.0 is not too bad: >=20 > diff -u orig/zip-3.0/globals.c chan/zip-3.0/globals.c > --- orig/zip-3.0/globals.c 2008-05-25 19:26:38.000000000 +0200 > +++ chan/zip-3.0/globals.c 2023-02-06 19:42:48.000000000 +0100 > @@ -106,6 +106,7 @@ > int noisy =3D 1; /* 0=3Dquiet operation */ > int extra_fields =3D 1; /* 0=3Dcreate minimum, 1=3Ddon't copy old,= 2=3Dkeep old */ > int use_descriptors =3D 0; /* 1=3Duse data descriptors 12/29/04 */ > +int no_add_suffix =3D 0; /* 1=3Ddo not add suffix .zip to archive n= ames without . */ > int zip_to_stdout =3D 0; /* output zipfile to stdout 12/30/04 */ > int allow_empty_archive =3D 0; /* if no files, create empty archive anywa= y 12/28/05 */ > int copy_only =3D 0; /* 1=3Dcopying archive entries only */ > diff -u orig/zip-3.0/zip.c chan/zip-3.0/zip.c > --- orig/zip-3.0/zip.c 2023-02-06 19:49:42.000000000 +0100 > +++ chan/zip-3.0/zip.c 2023-02-06 19:47:26.000000000 +0100 > @@ -1942,6 +1942,7 @@ > #ifdef UNICODE_TEST > #define o_sC 0x146 > #endif > +#define o_nas 0x147 >=20 >=20 > /* the below is mainly from the old main command line > @@ -2042,6 +2043,7 @@ > {"N", "notes", o_NO_VALUE, o_NOT_NEGATABLE, 'N', "add no= tes as entry comments"}, > #endif > {"o", "latest-time", o_NO_VALUE, o_NOT_NEGATABLE, 'o', "use la= test entry time as archive time"}, > + {"", "no-add-suffix", o_NO_VALUE, o_NOT_NEGATABLE, o_nas, "do n= ot add .zip suffix to archive name without ."}, > {"O", "output-file", o_REQUIRED_VALUE, o_NOT_NEGATABLE, 'O', "set ou= t zipfile different than in zipfile"}, > {"p", "paths", o_NO_VALUE, o_NOT_NEGATABLE, 'p', "store p= aths"}, > {"P", "password", o_REQUIRED_VALUE, o_NOT_NEGATABLE, 'P', "encryp= t entries, option value is password"}, > @@ -2378,6 +2380,7 @@ > before =3D 0; /* 0=3Dignore, else exclude files before this t= ime */ > after =3D 0; /* 0=3Dignore, else exclude files newer than t= his time */ >=20 > + no_add_suffix =3D 0 /* 0=3Dadd .zip if no . as usual, else use ar= chive name unchanged */ > special =3D ".Z:.zip:.zoo:.arc:.lzh:.arj"; /* List of special suffixes *= / > key =3D NULL; /* Scramble password if scrambling */ > key_needed =3D 0; /* Need scramble password */ > @@ -3299,6 +3302,11 @@ > break; > #endif >=20 > + case o_nas: > + no_add_suffix =3D 1; > + break; > + > + > case o_NON_OPTION_ARG: > /* not an option */ > /* no more options as permuting */ > @@ -3340,8 +3348,14 @@ > #endif /* !MACOS && !WINDLL */ > { > /* name of zipfile */ > - if ((zipfile =3D ziptyp(value)) =3D=3D NULL) { > - ZIPERR(ZE_MEM, "was processing arguments"); > + if (no_add_suffix) { > + zipfile =3D value; > + } > + else { > + if ((zipfile =3D ziptyp(value)) =3D=3D NULL) { > + ZIPERR(ZE_MEM, "was processing arguments"); > + } > + free(value); > } > /* read zipfile if exists */ > /* > @@ -3349,7 +3363,6 @@ > ZIPERR(r, zipfile); > } > */ > - free(value); > } > if (show_what_doing) { > fprintf(mesg, "sd: Zipfile name '%s'\n", zipfile); > diff -u orig/zip-3.0/zip.h chan/zip-3.0/zip.h > --- orig/zip-3.0/zip.h 2008-05-25 19:23:22.000000000 +0200 > +++ chan/zip-3.0/zip.h 2023-02-06 19:43:41.000000000 +0100 > @@ -442,6 +442,7 @@ > extern int use_privileges; /* use security privilege overrides */ > #endif > extern int use_descriptors; /* use data descriptors (extended headings= ) */ > +extern int no_add_suffix; /* do not add suffix .zip to archive name= s without . */ > extern int allow_empty_archive; /* if no files, create empty archive anywa= y */ > extern int copy_only; /* 1 =3D copy archive with no changes */ > extern int zip_to_stdout; /* output to stdout */ >=20 > But getting something like that accepted and distributed, and for Emacs > to tell whether the installed zip has that option or not, seems like a > lot of work. Maybe, at least in the meantime, we change it such that all write operations= for zip create files in temp, and move to / overwrite the original file whe= n done? Although I don=E2=80=99t have a full understanding on how that would= be done and whether there are problems along with it.=20=