From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 32559 invoked from network); 16 Sep 2023 20:05:09 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 16 Sep 2023 20:05:09 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1694894709; b=OGT1H7aqj7xDVlM/UOg1KtwmDc/KiQRn1P2IYjzTJlDxeRyYwNPxB+X8VjHumv0rIinnkZE183 9seTQjYBMflM/8QkGTKIVO96lCEQvrup/FD0I8P+S/PHhy8uZTcWlCsbDLjEZWrWnFim+QS5WM iZAwHiGfOy76FBztq4YB/KiQ2ew1N3sTrTII/x7dbYChCDAYGDxsIip8qMbP965RnYU1/hNmPl ux8gIjUqKAlNDAuHSS+0hVR6Fck6U9CBrHAijRBJR/cOQF5TF0pI1aFm21yXQ9u5lm6G18uuO/ J50unAaM+xDAEwsEgHr92SWseAQWHH9Rl+HYbR8bn4f6ww==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-ej1-f51.google.com) smtp.remote-ip=209.85.218.51; dkim=pass header.d=brasslantern-com.20230601.gappssmtp.com header.s=20230601 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1694894709; bh=XsyMHM9v+hJFl+QVA4qBDvz61M4IpKk+N2/sYg1y4g4=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:DKIM-Signature:DKIM-Signature; b=mDat2IDWDFXEmhbXwWSraR+c6kirxF26I7dKxaY8i8I7zYG7lQVGXsvsaMPrDlgblULoCQbCit l9Y1mbTYB3JdGQxlDtHiUjIsBVQq6vxpooZfD0XIPeIvMNJZM6W32hY4qpoFsqxghRAHytLhfz wMoV3ru7CiST23aclskl6ktJSBynwXSDjJ80s/KcSxc2SJJmGBeVS3bonF/3djIJdpBVt1CKfM xrp3Te5gjgsHTu8KtVyjB0aV9YZbdItJ3yj7LWnnJx42JeBppW+V7On9UwWe15JW5gADiBAKtG Ig9FMIdo6BWStifXq9mJUOPbum7qgJsToEJZlrfr/x+TfQ==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Type:To:Subject:Message-ID: Date:From:In-Reply-To:References:MIME-Version:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=ngl5Ir0HiWUsb7YlHsBL2hhVjD+rdiXKpwXYsaZhPT8=; b=B2210Rim4qzninKmXUe5VGqosC wu6XU1MehAnpnbMGDGmv9YG5s/0Ee9cDZToHUWvxSoENUTRYxRC35sb+q1etm6rZLFgRJqd7la7dq bd/wHNJkBCjIpTZ3E/hPqcVF5O3DbNtTBSArcZPTxWNjicx+0815Sd642u3VrfzJ/jY7qqcucA1Gt 8e4+DHjSgb2kPZWYgB5LXPN7JY/8zTu2wMqVmjgZb8/rGPstZttSxE0eV+0Lb2tFxYO3rblq3pEce UBREIkaxOB5VJdO8Sib6CyYrnp+enR+FvBbcqORBXFawU1DpaJw2Z50tU4f8TWr5bFLIuiIoDZMQl ljxuA0zA==; Received: by zero.zsh.org with local id 1qhbXQ-000C7T-Hs; Sat, 16 Sep 2023 20:05:08 +0000 Authentication-Results: zsh.org; iprev=pass (mail-ej1-f51.google.com) smtp.remote-ip=209.85.218.51; dkim=pass header.d=brasslantern-com.20230601.gappssmtp.com header.s=20230601 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none Received: from mail-ej1-f51.google.com ([209.85.218.51]:42447) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1qhbX5-000BnU-PJ; Sat, 16 Sep 2023 20:04:49 +0000 Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-99c93638322so701602166b.1 for ; Sat, 16 Sep 2023 13:04:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20230601.gappssmtp.com; s=20230601; t=1694894687; x=1695499487; darn=zsh.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=ngl5Ir0HiWUsb7YlHsBL2hhVjD+rdiXKpwXYsaZhPT8=; b=BVNy447+59si9Td0EaLKjVqFfXc6Tt1v29/XOgAFWxT5920Ymsr64EoCUrIwAlkjjM 79uFsXYLzQGl+ELdcUQreyLBAu5ziTf3Q+hFOpPWJjeMnIgjvfQ7ICnhE4hgUhD6vMxt ZF55Itxtaz7631mYN+GlNA46TCr4SrBbf/uPgmTcsDHwKyZOTIJOqfp18v2LZCQFo38J PDu0QdKOC6Wj5O2m4iQIuQqp2NRL8RJG0Zr5Orfl3n6LP7VCwSYJkiEGDcu26qwzaomt YNI504Z0Qo3pxz2QnLI/t3+go/HfcqJ6VaVGdNeoX5YIKT+gp593pcTvo0U2wsZVSuqM na3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694894687; x=1695499487; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ngl5Ir0HiWUsb7YlHsBL2hhVjD+rdiXKpwXYsaZhPT8=; b=XUX37ELOcC0PiQJAitgMzZNIXIH7OoKWocuZs9ZCNZaYchrTwWBJ2iVBG0ETk8p05k 7NrqrPLKCQ3jAuoKEJmcbdA2/J8RFsdvgooZgt2S07TofcN9Ax0VrFN7DR5KoK1AvzAR Ui//DJRkVQjUv92bLYVA986EOO94PA81ybyBtr+zd4Tbm/hR1Vd0QWV2vA5zwAlnvfu4 utzkf85ahkol+goS3FL4EfnISSUpvRjUoCDbiWs5kjYafGCTjhBhqcTWe7c+bciL3rr5 +IGrBcEMLikkjzQLLjIgiQlLJwv/0yvAXYcHbXl+b2IO7rYp3iK1wiUyrr3m0s9tENSZ Sx5g== X-Gm-Message-State: AOJu0Yw5Q24iiHzNpWJNcGaNVIzABp5YomM9MQCw+RTTpojid+DK3sn5 A+Inm5L2bMP9Sns1h/jk0UPvYEZaNtRpHDw0X3sUP4dgLVAUhDdf X-Google-Smtp-Source: AGHT+IHFDvjAT9JWwyEBBMimEUJDLaqSXGBWtzwgSBEEce0xL0zzWiB+UTsyXgJDwNp62kA4mFH6F4TtrSNdLUGB1p4= X-Received: by 2002:a17:906:74d2:b0:9a2:86a:f9c0 with SMTP id z18-20020a17090674d200b009a2086af9c0mr6778464ejl.1.1694894687165; Sat, 16 Sep 2023 13:04:47 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Bart Schaefer Date: Sat, 16 Sep 2023 13:04:35 -0700 Message-ID: Subject: Re: [PATCH] mapfile without HAVE_MMAP should not trim newlines To: Zsh hackers list Content-Type: multipart/mixed; boundary="000000000000c2cea106057f6b1b" X-Seq: 52153 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: --000000000000c2cea106057f6b1b Content-Type: text/plain; charset="UTF-8" Dangit, diff'd that against the wrong branch. Corrected patch. --000000000000c2cea106057f6b1b Content-Type: text/plain; charset="US-ASCII"; name="mapfile-nl.txt" Content-Disposition: attachment; filename="mapfile-nl.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lmmgiwe20 ZGlmZiAtLWdpdCBhL1NyYy9Nb2R1bGVzL21hcGZpbGUuYyBiL1NyYy9Nb2R1bGVzL21hcGZpbGUu YwppbmRleCBkZDg2ZmI1OTYuLjg0Y2RmZWExOCAxMDA2NDQKLS0tIGEvU3JjL01vZHVsZXMvbWFw ZmlsZS5jCisrKyBiL1NyYy9Nb2R1bGVzL21hcGZpbGUuYwpAQCAtMTcwLDYgKzE3MCw4IEBAIGdl dF9jb250ZW50cyhjaGFyICpmbmFtZSkKICNpZmRlZiBVU0VfTU1BUAogICAgIGNhZGRyX3QgbW1w dHI7CiAgICAgc3RydWN0IHN0YXQgc2J1ZjsKKyNlbHNlCisgICAgb2ZmX3Qgc2l6ZTsKICNlbmRp ZgogICAgIGNoYXIgKnZhbDsKICAgICB1bm1ldGFmeShmbmFtZSA9IHp0cmR1cChmbmFtZSksICZm ZCk7CkBAIC0xOTYsMTIgKzE5OCw4IEBAIGdldF9jb250ZW50cyhjaGFyICpmbmFtZSkKICAgICBj bG9zZShmZCk7CiAjZWxzZSAvKiBkb24ndCBVU0VfTU1BUCAqLwogICAgIHZhbCA9IE5VTEw7Ci0g ICAgaWYgKChmZCA9IG9wZW4oZm5hbWUsIE9fUkRPTkxZIHwgT19OT0NUVFkpKSA+PSAwKSB7Ci0J TGlua0xpc3QgbGw7Ci0KLQlpZiAoKGxsID0gcmVhZG91dHB1dChmZCwgMSwgMCkpKQotCSAgICB2 YWwgPSBwZWVrZmlyc3QobGwpOwotICAgIH0KKyAgICBpZiAoKHNpemUgPSB6c3R1ZmYoJnZhbCwg Zm5hbWUpKSA+IDApCisJdmFsID0gbWV0YWZ5KHZhbCwgc2l6ZSwgTUVUQV9IRUFQRFVQKTsKICNl bmRpZiAvKiBVU0VfTU1BUCAqLwogICAgIGZyZWUoZm5hbWUpOwogICAgIHJldHVybiB2YWw7CmRp ZmYgLS1naXQgYS9TcmMvaW5wdXQuYyBiL1NyYy9pbnB1dC5jCmluZGV4IDBkYTA2NWU1MS4uOGQ3 ZjQ0ZDdjIDEwMDY0NAotLS0gYS9TcmMvaW5wdXQuYworKysgYi9TcmMvaW5wdXQuYwpAQCAtNjEw LDExICs2MTAsMTEgQEAgaW51bmdldGMoaW50IGMpCiAgICAgfQogfQogCi0vKiBzdHVmZiBhIHdo b2xlIGZpbGUgaW50byB0aGUgaW5wdXQgcXVldWUgYW5kIHByaW50IGl0ICovCisvKiBzdHVmZiBh IHdob2xlIGZpbGUgaW50byBtZW1vcnkgYW5kIHJldHVybiBpdCAqLwogCiAvKiovCi1pbnQKLXN0 dWZmKGNoYXIgKmZuKQorb2ZmX3QKK3pzdHVmZihjaGFyICoqb3V0LCBjb25zdCBjaGFyICpmbikK IHsKICAgICBGSUxFICppbjsKICAgICBjaGFyICpidWY7CkBAIC02MjIsMjAgKzYyMiw1MCBAQCBz dHVmZihjaGFyICpmbikKIAogICAgIGlmICghKGluID0gZm9wZW4odW5tZXRhKGZuKSwgInIiKSkp IHsKIAl6ZXJyKCJjYW4ndCBvcGVuICVzIiwgZm4pOwotCXJldHVybiAxOworCXJldHVybiAtMTsK ICAgICB9CisgICAgcXVldWVfc2lnbmFscygpOwogICAgIGZzZWVrKGluLCAwLCBTRUVLX0VORCk7 CiAgICAgbGVuID0gZnRlbGwoaW4pOwogICAgIGZzZWVrKGluLCAwLCBTRUVLX1NFVCk7CiAgICAg YnVmID0gKGNoYXIgKil6YWxsb2MobGVuICsgMSk7Ci0gICAgaWYgKCEoZnJlYWQoYnVmLCBsZW4s IDEsIGluKSkpIHsKKyAgICBpZiAobGVuICYmICEoZnJlYWQoYnVmLCBsZW4sIDEsIGluKSkpIHsK IAl6ZXJyKCJyZWFkIGVycm9yIG9uICVzIiwgZm4pOwogCWZjbG9zZShpbik7Ci0JemZyZWUoYnVm LCBsZW4gKyAxKTsKLQlyZXR1cm4gMTsKKwl1bnF1ZXVlX3NpZ25hbHMoKTsKKwlyZXR1cm4gLTE7 CiAgICAgfQogICAgIGZjbG9zZShpbik7CiAgICAgYnVmW2xlbl0gPSAnXDAnOworICAgICpvdXQg PSBidWY7CisgICAgdW5xdWV1ZV9zaWduYWxzKCk7CisgICAgcmV0dXJuIGxlbjsKK30KKworLyoq LworY2hhciAqCit6dHVmZihjb25zdCBjaGFyICpmbikKK3sKKyAgICBjaGFyICpidWY7CisgICAg b2ZmX3QgbGVuID0genN0dWZmKCZidWYsIGZuKTsKKyAgICBpZiAobGVuID4gMCkKKwlyZXR1cm4g YnVmOworICAgIGVsc2UKKwlyZXR1cm4gTlVMTDsKK30KKworLyogc3R1ZmYgYSB3aG9sZSBmaWxl IGludG8gdGhlIGlucHV0IHF1ZXVlIGFuZCBwcmludCBpdCAqLworCisvKiovCitpbnQKK3N0dWZm KGNoYXIgKmZuKQoreworICAgIGNoYXIgKmJ1ZjsKKyAgICBvZmZfdCBsZW4gPSB6c3R1ZmYoJmJ1 ZiwgZm4pOworCisgICAgaWYgKGxlbiA8IDApCisJcmV0dXJuIDE7CisgICAgCiAgICAgZndyaXRl KGJ1ZiwgbGVuLCAxLCBzdGRlcnIpOwogICAgIGZmbHVzaChzdGRlcnIpOwogICAgIGlucHV0c2V0 bGluZShtZXRhZnkoYnVmLCBsZW4sIE1FVEFfUkVBTExPQyksIElOUF9GUkVFKTsK --000000000000c2cea106057f6b1b--