From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10790 invoked by alias); 22 Apr 2018 23:17:17 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 42700 Received: (qmail 12866 invoked by uid 1010); 22 Apr 2018 23:17:17 -0000 X-Qmail-Scanner-Diagnostics: from mail-qt0-f177.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.216.177):SA:0(-1.9/5.0):. Processed in 1.783248 secs); 22 Apr 2018 23:17:17 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, T_DKIMWL_WL_MED,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: ricardo@giorni.co X-Qmail-Scanner-Mime-Attachments: |smime.p7s| X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=giorni-co.20150623.gappssmtp.com; s=20150623; h=from:mime-version:subject:message-id:date:to; bh=IvgVc8MOwZZNg14mQdNEXxb1U+0DTi+3NWKAqjBTa8E=; b=pjsdr4fQkWH3URFnr+s3TqMn91cDLzJP6Pt70yHSNUNhHeWBxqTnHlYRk55obV3O1G 4OnB7oSDJ/Kz+E4qZhC0M8utqmpqAqsaLhCxFZmKWVEFZQhlwj28O5pNM7szJGv5J2VL ImsAGK0RtafW66T1dX1jzd15YMPtgg2b02gjtnLdYtYM2gny9+hV3UOs6k8EhZBA/U6x /15ypy90rbXyhl/+405XwUYRJyyC5BJb6/0isvFwfxEKU/VJ9cWi1/YDd6tNvTfW8OGA lKMjp0lRuF1EOBeZBp+VdToWJtbtdbjd9xvdJAQWFsoRDl0EodkiSmIKyaQ/PmLxlkeh hLpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:mime-version:subject:message-id:date:to; bh=IvgVc8MOwZZNg14mQdNEXxb1U+0DTi+3NWKAqjBTa8E=; b=H9yODKqRiR9PGnOyTtcKEnFQ/BumvsO+nZqWQeHpQr8Rk6GGZaDm8J5HvDhNgslDkg f4ZgStabY6gsWNBS21TuwrpX44+Q+4Fre8KmpsHvTgfNYCtaQm8PKEtO7U+A8pb+rxsQ CNL9LqMy5nV6gHjfmmxGbh8sFqbNtVbV35QiY+4QQTJkg4YPMP0zEpZb+nhy80BrAXo0 OO5C5ZFU7xx6yLI+//3R3CUYF0vmpU+7baJE2T8QGI1E48/HfGCfMfGuEvumSpV6zP83 cVLszv9xe8/7ySnnlQQKvfnCJlxL7oixj8z7yDKx7a/mV48aVrOGvTnkAwRf1tOTDzdk f5Yg== X-Gm-Message-State: ALQs6tDkDXXOu650VdP1Tn9IyO2bfmMr2zWVcd+HBK8Lwo5PtFQ0ZnCn cXhlB/fVo8uAmYCny/Gp+sbDVDOLHmw= X-Google-Smtp-Source: AIpwx4990EL5p3poe8IcI7RUOxKa9z9FTVwWm9KE5kdX//nlwaJ3pH3AViLcwFd4H54C8IA5j6/WXw== X-Received: by 2002:ac8:190b:: with SMTP id t11-v6mr20236900qtj.244.1524439031419; Sun, 22 Apr 2018 16:17:11 -0700 (PDT) From: Ricardo Giorni Content-Type: multipart/signed; boundary="Apple-Mail=_5AE2214B-665B-41F2-B833-03694950A87A"; protocol="application/pkcs7-signature"; micalg=sha1 Mime-Version: 1.0 (Mac OS X Mail 11.3 \(3445.6.18\)) Subject: [PATCH] fix backslash added incompatibility after previous patches Message-Id: <8AA6B85B-C8FC-41B9-8FA9-FB35E711A387@giorni.co> Date: Sun, 22 Apr 2018 20:16:51 -0300 To: zsh-workers@zsh.org X-Mailer: Apple Mail (2.3445.6.18) --Apple-Mail=_5AE2214B-665B-41F2-B833-03694950A87A Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 After patch 42355, escaped backslashes on here-documents stopped = working. cat <<-HERE foo\\ bar HERE Before patch 42355 (zsh 5.4), and on latest dash and bash: foo\ bar After: foo\ bar =E2=80=94 Ricardo diff --git i/Src/exec.c w/Src/exec.c index 1b622d56f..08789cc04 100644 --- i/Src/exec.c +++ w/Src/exec.c @@ -4427,16 +4427,16 @@ gethere(char **strp, int typ) bptr =3D buf + bsiz; bsiz *=3D 2; } - if (lexstop) + if (lexstop || c =3D=3D '\n') break; - if (c =3D=3D '\n') { - if (!qt && bptr > t && *(bptr - 1) =3D=3D '\\') { - /* line continuation */ + if (!qt && c =3D=3D '\\') { + *bptr++ =3D c; + c =3D hgetc(); + if (c =3D=3D '\n') { bptr--; c =3D hgetc(); continue; - } else - break; + } } *bptr++ =3D c; c =3D hgetc(); diff --git i/Test/A04redirect.ztst w/Test/A04redirect.ztst index b5b65cf5d..1e17dddd4 100644 --- i/Test/A04redirect.ztst +++ w/Test/A04redirect.ztst @@ -174,6 +174,30 @@ >some stuff >to test >tab\stripping +>Last line + + heretest() { + print First line + cat <<-HERE + $foo\\ + $foo + some\\ \ + stuff + to\ + test \\ + more backslash craziness\\\\\\\\\ + wild + HERE + print Last line + } + heretest +0:No line continuation in here-document on escaped backslash +>First line +>bar\ +>bar +>some\ stuff +>to test \ +>more backslash craziness\\\\ wild >Last line =20 # --Apple-Mail=_5AE2214B-665B-41F2-B833-03694950A87A Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIHvDCCB7gw ggWgoAMCAQICEB0xNurlfZVPGFHSXsr8GaQwDQYJKoZIhvcNAQELBQAwdzELMAkGA1UEBhMCQlIx EzARBgNVBAoTCklDUC1CcmFzaWwxNjA0BgNVBAsTLVNlY3JldGFyaWEgZGEgUmVjZWl0YSBGZWRl cmFsIGRvIEJyYXNpbCAtIFJGQjEbMBkGA1UEAxMSQUMgUFJPREVNR0UgUkZCIEc0MB4XDTE3MDcz MTE4NDU1NloXDTE4MDczMTE4NDU1NlowgfAxCzAJBgNVBAYTAkJSMRMwEQYDVQQKDApJQ1AtQnJh c2lsMQswCQYDVQQIDAJNRzEXMBUGA1UEBwwOQmVsbyBIb3Jpem9udGUxNjA0BgNVBAsMLVNlY3Jl dGFyaWEgZGEgUmVjZWl0YSBGZWRlcmFsIGRvIEJyYXNpbCAtIFJGQjEWMBQGA1UECwwNUkZCIGUt Q05QSiBBMTEhMB8GA1UECwwYQXV0ZW50aWNhZG8gcG9yIFBST0RFTUdFMTMwMQYDVQQDDCpSSUNB UkRPIEdVSU1BUkFFUyBHSU9STkkgTUU6MjA4Mjc3NjUwMDAxMDcwggEiMA0GCSqGSIb3DQEBAQUA A4IBDwAwggEKAoIBAQCecld69WYtsepDZRlOoF86y4+MyGWeuo0DeGLpPiym5cD0oV4hgDh4DAlE myf6O3cK+dbEvguTv4upsbP/GkoqLuaL1oxPUjCqLjJHfkwfU593wnOrMZq8NiWClVLgxBk0aDEc mjWiTkvX2MP1dZ32WCZT/USYCGb5bXT8N2IO59DsOPDJ2KnB3iOXeBAvLITE5xevsMG8feGvHJRD HzMSGvLsQyDJEtVp7WDipwarAEAPBHmKsR26/uExhNSBKEfmfEHJPQWf68W0eaQQi3j/6mfylAuW 1UvihPADRPEES596zhaYiUbeCaNfBuK5gB1jChxcLaW9udpC/KSh0vs7AgMBAAGjggLEMIICwDCB tgYDVR0RBIGuMIGroD0GBWBMAQMEoDQEMjI0MDUxOTg2MDE1MjgwNDQ2MzAwMDAwMDAwMDAwMDAw MDAwTUcxMTgyODkxM1NTUE1HoCMGBWBMAQMCoBoEGFJJQ0FSRE8gR1VJTUFSQUVTIEdJT1JOSaAZ BgVgTAEDA6AQBA4yMDgyNzc2NTAwMDEwN6AXBgVgTAEDB6AOBAwwMDAwMDAwMDAwMDCBEXJpY2Fy ZG9AZ2lvcm5pLmNvMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAU0HhDzIfy/WCuVn3e3YThQZOqDbsw fQYDVR0gBHYwdDByBgZgTAECARcwaDBmBggrBgEFBQcCARZaaHR0cDovL2ljcC1icmFzaWwuY2Vy dGlzaWduLmNvbS5ici9yZXBvc2l0b3Jpby9kcGMvQUNfUFJPREVNR0VfUkZCL0RQQ19BQ19QUk9E RU1HRV9SRkIucGRmMIG6BgNVHR8EgbIwga8wVqBUoFKGUGh0dHA6Ly9pY3AtYnJhc2lsLmNlcnRp c2lnbi5jb20uYnIvcmVwb3NpdG9yaW8vbGNyL0FDUFJPREVNR0VSRkJHNC9MYXRlc3RDUkwuY3Js MFWgU6BRhk9odHRwOi8vaWNwLWJyYXNpbC5vdXRyYWxjci5jb20uYnIvcmVwb3NpdG9yaW8vbGNy L0FDUFJPREVNR0VSRkJHNC9MYXRlc3RDUkwuY3JsMA4GA1UdDwEB/wQEAwIF4DAdBgNVHSUEFjAU BggrBgEFBQcDAgYIKwYBBQUHAwQwbgYIKwYBBQUHAQEEYjBgMF4GCCsGAQUFBzAChlJodHRwOi8v aWNwLWJyYXNpbC5jZXJ0aXNpZ24uY29tLmJyL3JlcG9zaXRvcmlvL2NlcnRpZmljYWRvcy9BQ19Q Uk9ERU1HRV9SRkJfRzQucDdjMA0GCSqGSIb3DQEBCwUAA4ICAQCJ/aQdTlfGCgBqzzamV832dXSD aHFhyUOKstp3+p0ClT+NcJEAIVxVqkAElMbbhYQwjoBRQYJp9e4205as2oGSYVcU0xYYmMOLYD2e qeUorttFDkeFM4tz1zolwhHMh0kH+YJRUrsuiME0Rojg0DM8DNDW4Fl+CUMyhau27vuJ9hrJIktE TdQAdTOxZ3KNYrstWy3ZH5FaediBL+k7XIcxBDR977MjRMPTFBxC0bpYLdOcsGE6f0VYxQ+CgtYU wYGuP+tP+ixR1QL2vu3fVzsOm8EhUqi6Ds2Ye3SezJPIlhWTBWP56vKb7ZLwtCQ2DQKvs5CSOPIb Lr2jNRdQF3VFIMpchISap7hhs5OwJ6QOVxxIaYoJ0/i+JhvpLqWA7DGKU9B2BRwFlFhzQyKkfwxi W6n/7a0Lj8SQpsgSYY7Q4Vxky9VceLEG6Ei6l0RAgqsjv2hoHbq8ujw8m/qrUGtH3ZuOjoJhCYxZ 5RAz3igMIAzcZZn2z8S/2uopiUsCJvsF7KZLuW/zxWKbXeNIivy9OH++vYFl3dBgTQKlgy6cDSvf JPZOmKVw6TK445Alyt5vp4U35kf5g658rMT0ZUbkSQeawlTSoiwuIfZogeJR1JIpIfyUT5Tavc4G lvObCr596mYhMYZzj0z5gJFaEjBtA0mAj1GKqYLPlWmdPNSvzDGCA1QwggNQAgEBMIGLMHcxCzAJ BgNVBAYTAkJSMRMwEQYDVQQKEwpJQ1AtQnJhc2lsMTYwNAYDVQQLEy1TZWNyZXRhcmlhIGRhIFJl Y2VpdGEgRmVkZXJhbCBkbyBCcmFzaWwgLSBSRkIxGzAZBgNVBAMTEkFDIFBST0RFTUdFIFJGQiBH NAIQHTE26uV9lU8YUdJeyvwZpDAJBgUrDgMCGgUAoIIBnTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcN AQcBMBwGCSqGSIb3DQEJBTEPFw0xODA0MjIyMzE2NTJaMCMGCSqGSIb3DQEJBDEWBBTOj6esd0cz gxCviOwGSMQ/D3z3VjCBnAYJKwYBBAGCNxAEMYGOMIGLMHcxCzAJBgNVBAYTAkJSMRMwEQYDVQQK EwpJQ1AtQnJhc2lsMTYwNAYDVQQLEy1TZWNyZXRhcmlhIGRhIFJlY2VpdGEgRmVkZXJhbCBkbyBC cmFzaWwgLSBSRkIxGzAZBgNVBAMTEkFDIFBST0RFTUdFIFJGQiBHNAIQHTE26uV9lU8YUdJeyvwZ pDCBngYLKoZIhvcNAQkQAgsxgY6ggYswdzELMAkGA1UEBhMCQlIxEzARBgNVBAoTCklDUC1CcmFz aWwxNjA0BgNVBAsTLVNlY3JldGFyaWEgZGEgUmVjZWl0YSBGZWRlcmFsIGRvIEJyYXNpbCAtIFJG QjEbMBkGA1UEAxMSQUMgUFJPREVNR0UgUkZCIEc0AhAdMTbq5X2VTxhR0l7K/BmkMA0GCSqGSIb3 DQEBAQUABIIBAC7xqIMIRCAE2ohJw4Qb32DM4Qf/xaFm3F/w6W5GTgdLvyxCRb1Na0VZRhylR+Pq oouEfIVEfxr5Wn+Wy+3mn9xz6zeVJrBwhufs/PsNVIhZ42ANBygfgJ9vrO8XXXzC5rzGJxtkk814 i8/ZKevt/wTbwxK6NNVyQpW1+V/h0A09bSRyIG3LjlmlrzFBdcHij1glGNh1S1gBZUPTcqqMGyjm 4FaMK7Obf10XUih2NzKFD+2Vt96VLpakjLVBMcMzviqiMv7cjRZ+JP3Uq6IPr3I2B/4WC79UHZGU T1qWtA8chMzHPIbD+5cks88szVUxQE2HBKyoj/wchp9vWBCwQPEAAAAAAAA= --Apple-Mail=_5AE2214B-665B-41F2-B833-03694950A87A--