From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by sourceware.org (Postfix) with ESMTPS id 9E7B23858C98; Thu, 4 Apr 2024 21:04:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9E7B23858C98 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9E7B23858C98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::52f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712264666; cv=none; b=DX0Kkl8bXshHfW9I4XcSXTtm1whxCTjHGTZ8/Za4v6wPqRGe9RMQh6w/QaEeB2ImLOs/FtBMh2hYJjR7bjDPWbt9I74CCD90i79q33vWaHfEunklxte4N8j+g32mMOzyLamPfG3foXYXDMq4au0q7ZoVr5CCnPWCou4JPCykePs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712264666; c=relaxed/simple; bh=dCKFImr03yxCss6R7564zTbFxZUzsKPXF2RjHKTzjR0=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=CmE5tluDZdw9LNz1xATWLcnoHATWYK2kVspUoYwdhc8ZypSwTlSgyEEHrI9O9PG+2y32To5lP+kyD9jkPZIlrtjCkJs5ct+exPjZSlW0iP3Nh9R+spa4cthyzEoHCuyZtgXGrW5Y/v6CvFsH+vUfhM+ojkSEBge59KS7WWEkGr8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-5f0a485dab9so173326a12.1; Thu, 04 Apr 2024 14:04:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712264662; x=1712869462; darn=gcc.gnu.org; h=in-reply-to:autocrypt:from:content-language:references:cc:to :subject:user-agent:mime-version:date:message-id:from:to:cc:subject :date:message-id:reply-to; bh=drYfe47WoYw2ArMW1zLrk9Ty4TkJ25ctOUIAKOv4lC4=; b=WJuvBkDOO0jitwJsV9y0682gOcwg9VV6VDfNt7jUWu5j/dZT3w5u8NDe8DI2vXJQ2H m17jXMT438Kg2vhVUU8S4IYj+kPfgLJN7bTfHfyzViYw79oPeIi/yOYNj3Vjdu+QH/XD NG4qN2ESTWZWP4hI5MFR9l74ynMktxJ7V4KJfICq4kXNlfMo603RGERPX9uc/ibX/bQ7 gKHZYmhRya0VU3QvXdPiM1NmuITvP4iuC6vcHncEDaUN4mE0Z7YnpXG5t5LG0FrANb1b EKOsoWsMUaz1QhCT80gAfW47vECSmWUX3XvX6MpvXjBU2U8uwCKixaPI4xW98zxLksqa laAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712264662; x=1712869462; h=in-reply-to:autocrypt:from:content-language:references:cc:to :subject:user-agent:mime-version:date:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=drYfe47WoYw2ArMW1zLrk9Ty4TkJ25ctOUIAKOv4lC4=; b=ILzo8Pc11lAMFzhF3iP3mcslzxMawbH6Z/QFKxdalDRcSny+kjE6U1RIOUEks9hNDg GwJp4kyvpAr43NFUeRsWDmORfHjhX/8cQeWbekKWA3QaRTU2yA/k7wy2D14WQoqjdejE Oxr5KtwwGO+J3/0mKT+LQsXtW6YEbJ7uVJbaPehvl3tFMjzDTocvMT3LC46RXuHwvgxt 28IfC9lt0WZwbpZ3SBtzvX1VsrydZekRX7tXifWyo/Qkw94ahT034Q4yX/4kQxxBLDsk 6+tIQsrJXMJeXu2qZO3ScnwYdUa2WyuS2n9Pz2vwUMIEpnAuacK7Wwlqw3RL8e3nSeUe BqOA== X-Forwarded-Encrypted: i=1; AJvYcCXBrcynrXQGwo4lSzMe9rQ4b6BDLJ2XgmvkHkbICgZuTBNr6O46NB5zt4oqXy7tfIufFn5X7q+eWQ1VNy4QMdrpa0sq X-Gm-Message-State: AOJu0YxxUD4sTA5zwAHGLJFVTq6zzYuiqguqU7deIO6t+vCGW2I+VO1g CChvYp4kP8VFx2HZAJ7iw3WJfH37e+BmXssXYbV94IDQ0AgNQI5s X-Google-Smtp-Source: AGHT+IE32vNjDBxQSPqEWpLsWOZYGvxqq9GD0elWRkwkENEa0tootMriTz++8DhYKCVFUANNDC2PvA== X-Received: by 2002:a05:6a21:32a4:b0:1a7:23ae:a8aa with SMTP id yt36-20020a056a2132a400b001a723aea8aamr3909476pzb.3.1712264662429; Thu, 04 Apr 2024 14:04:22 -0700 (PDT) Received: from [192.168.1.20] ([50.37.177.113]) by smtp.gmail.com with ESMTPSA id u7-20020a17090a4bc700b00299101c1341sm149515pjl.18.2024.04.04.14.04.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Apr 2024 14:04:22 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------jdYFLQG92OEgEnsohlEQoFVX" Message-ID: Date: Thu, 4 Apr 2024 14:04:21 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: =?UTF-8?Q?Re=3A_=5Bpatch=2C_libgfortran=5D_PR114304_-_=5B13/14_Regr?= =?UTF-8?Q?ession=5D_libgfortran_I/O_=E2=80=93_bogus_=22Semicolon_not_allowe?= =?UTF-8?Q?d_as_separator_with_DECIMAL=3D=27point=27=22?= To: Tobias Burnus , gfortran Cc: gcc-patches , Jerry D References: <9a848b89-ee95-44f7-8491-cbe22804edf4@gmail.com> Content-Language: en-US From: Jerry D Autocrypt: addr=jvdelisle2@gmail.com; keydata= xjMEY5TlkxYJKwYBBAHaRw8BAQdAyrkRDhmJhSTTlV/50gJLlvliU6/Lm5C9ViKV8T9y1GnN HkplcnJ5IEQgPGp2ZGVsaXNsZTJAZ21haWwuY29tPsKJBBMWCAAxFiEEOFR0TS0390uh8dRV uWXAJaWpwWoFAmOU5ZMCGwMECwkIBwUVCAkKCwUWAgMBAAAKCRC5ZcAlpanBalsJAP4wdCiH 2Of9oZv1QWgZ/AVdbWFM3Fv47/WZQHOXfoZ9HgD6AkXrKeJ+6usST7PEaDJjptaViT1fLiYY V/6XaOKSsgLOOARjlOWTEgorBgEEAZdVAQUBAQdAdA7PczYnl07vnOT9oP/wvvMDd4HP09Zl g3LzwXQJWT8DAQgHwngEGBYIACAWIQQ4VHRNLTf3S6Hx1FW5ZcAlpanBagUCY5TlkwIbDAAK CRC5ZcAlpanBasF/AQCa5WjlsVpLsEiggZyT18MOJNAdeRd7wkGDUrwedHrvawD/cE1H+/Ms L1ZwvQiLfGdx8crigQqWTQyos4kH8Wx82wc= In-Reply-To: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This is a multi-part message in MIME format. --------------jdYFLQG92OEgEnsohlEQoFVX Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 4/4/24 2:31 AM, Tobias Burnus wrote: > Hi Jerry, > --- snip --- > The patch looks mostly like I would expect, except for decimal='point' > and a ';' which is *not* preceded by a space. > > Thanks for working on it. > > Regarding the 'except' case: > --- snip --- > i.e. for the following string, I had *expected an error*: > >  point, isreal =  F , testinput = ";"n=          42  ios=           0 >  point, isreal =  F , testinput = "5;"n=           5  ios=           0 >  point, isreal =  T , testinput = "8;"r=   8.00000000      ios= 0 >  point, isreal =  T , testinput = "3.3;"r=   3.29999995      ios= 0 >  point, isreal =  T , testinput = "3,3;"r=   3.00000000      ios= 0 > --- snip --- > I have attached the modified testcase linked above; consider adding it > as well. - Changes to the one of the attachment: > - I added a few additional (albeit boring) tests > - I added an expected output + error diagnostic. > > The testcase assumes an error for ';' as separator (with 'point'), > unless there is a space before it. > --- snip --- Here attached is the revised patch. I replaced the new test case I had with the one you provided modified and it now passes. I modified the test case pr105473.f90 to expect the error on semicolon. Regression tested on X86_64. OK for trunk and a bit later back port to 13? Cheers, Jerry --------------jdYFLQG92OEgEnsohlEQoFVX Content-Type: text/x-patch; charset=UTF-8; name="submit2.diff" Content-Disposition: attachment; filename="submit2.diff" Content-Transfer-Encoding: base64 Y29tbWl0IDljODMxOGNkODcwM2Q0OWFkNzU2M2U4OTc2NWY4ODQ5ZWJjMTQzODUKQXV0aG9y OiBKZXJyeSBEZUxpc2xlIDxqdmRlbGlzbGVAZ2NjLmdudS5vcmc+CkRhdGU6ICAgVGh1IEFw ciA0IDEzOjQ4OjIwIDIwMjQgLTA3MDAKCiAgICBsaWJmb3J0cmFuOiBGaXggaGFuZGxpbmcg b2YgZm9ybWF0dGVkIHNlcGFyYXRvcnMuCiAgICAKICAgICAgICAgICAgUFIgbGliZm9ydHJh bi8xMTQzMDQKICAgICAgICAgICAgUFIgbGliZm9ydHJhbi8xMDU0NzMKICAgIAogICAgbGli Z2ZvcnRyYW4vQ2hhbmdlTG9nOgogICAgCiAgICAgICAgICAgICogaW8vbGlzdF9yZWFkLmMg KGVhdF9zZXBhcmF0b3IpOiBBZGQgbG9naWMgdG8gaGFuZGxlIHNwYWNlcwogICAgICAgICAg ICBwcmVjZWRpbmcgYSBjb21tYSBvciBzZW1pY29sb24gc3VjaCB0aGF0IHRoYXQgYSAnbnVs bCcgcmVhZAogICAgICAgICAgICBvY2N1cnMgd2l0aG91dCBlcnJvciBhdCB0aGUgZW5kIG9m IGNvbW1hIG9yIHNlbWljb2xvbgogICAgICAgICAgICB0ZXJtaW5hdGVkIGlucHV0IGxpbmVz LiBBZGQgY2hlY2sgYW5kIGVycm9yIG1lc3NhZ2UgZm9yICc7Jy4KICAgIAogICAgZ2NjL3Rl c3RzdWl0ZS9DaGFuZ2VMb2c6CiAgICAKICAgICAgICAgICAgKiBnZm9ydHJhbi5kZy9wcjEw NTQ3My5mOTA6IE1vZGlmeSB0byB2ZXJpZnkgbmV3IGVycm9yIG1lc3NhZ2UuCiAgICAgICAg ICAgICogZ2ZvcnRyYW4uZGcvcHIxMTQzMDQuZjkwOiBOZXcgdGVzdC4KCmRpZmYgLS1naXQg YS9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL3ByMTA1NDczLmY5MCBiL2djYy90ZXN0c3Vp dGUvZ2ZvcnRyYW4uZGcvcHIxMDU0NzMuZjkwCmluZGV4IDI2NzlmNmJiNDQ3Li44NjNhMzEy Yzc5NCAxMDA2NDQKLS0tIGEvZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9wcjEwNTQ3My5m OTAKKysrIGIvZ2NjL3Rlc3RzdWl0ZS9nZm9ydHJhbi5kZy9wcjEwNTQ3My5mOTAKQEAgLTks MTEgKzksMTEgQEAKICAgbiA9IDk5OTsgbSA9IDc3Nzsgcj0xLjIzNDUKICAgeiA9IGNtcGx4 KDAuMCwwLjApCiAKLSEgQ2hlY2sgdGhhdCBzZW1pLWNvbG9uIGlzIGFsbG93ZWQgYXMgc2Vw YXJhdG9yIHdpdGggZGVjaW1hbD1wb2ludC4KKyEgQ2hlY2sgdGhhdCBzZW1pLWNvbG9uIGlz IG5vdCBhbGxvd2VkIGFzIHNlcGFyYXRvciB3aXRoIGRlY2ltYWw9cG9pbnQuCiAgIGlvcz0w CiAgIHRlc3RpbnB1dCA9ICcxOzE3OzMuMTQxNTknCiAgIHJlYWQodGVzdGlucHV0LCosZGVj aW1hbD0ncG9pbnQnLGlvc3RhdD1pb3MpIG4sIG0sIHIKLSAgaWYgKGlvcyAvPSAwKSBzdG9w IDEKKyAgaWYgKGlvcyAvPSA1MDEwKSBzdG9wIDEKIAogISBDaGVjayB0aGF0IHNlbWktY29s b24gYWxsb3dlZCBhcyBhIHNlcGFyYXRvciB3aXRoIGRlY2ltYWw9cG9pbnQuCiAgIGlvcz0w CmRpZmYgLS1naXQgYS9nY2MvdGVzdHN1aXRlL2dmb3J0cmFuLmRnL3ByMTE0MzA0LmY5MCBi L2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4uZGcvcHIxMTQzMDQuZjkwCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi44MzQ0YTllYTg1NwotLS0gL2Rldi9udWxsCisr KyBiL2djYy90ZXN0c3VpdGUvZ2ZvcnRyYW4uZGcvcHIxMTQzMDQuZjkwCkBAIC0wLDAgKzEs MTAxIEBACishIHsgZGctZG8gcnVuIH0KKyEKKyEgUFIgZm9ydHJhbi8xMTQzMDQKKyEKKyEg U2VlIGFsc28gUFIgZm9ydHJhbi8xMDU0NzMKKyEKKyEgVGVzdGluZzogRG9lcyBsaXN0LWRp cmVjdGVkIHJlYWRpbmcgYW4gaW50ZWdlci9yZWFsIGFsbG93IHNvbWUgbm9uLWludGVnZXIg aW5wdXQ/CishCishIE5vdGU6IEdDQyByZXN1bHQgY29tbWVudHMgYmVmb3JlIGZpeCBvZiB0 aGlzIFBSLgorCisgIGltcGxpY2l0IG5vbmUKKyAgY2FsbCB0KC50cnVlLiwgICdjb21tYScs ICc7JykgISBObyBlcnJvciBzaG93bgorICBjYWxsIHQoLmZhbHNlLiwgJ3BvaW50JywgJzsn KSAhIC8hXCBnZm9ydHJhbjogbm8gZXJyb3IsIG90aGVyczogZXJyb3IKKyAgY2FsbCB0KC5m YWxzZS4sICdjb21tYScsICcsJykgISBFcnJvciBzaG93bgorICBjYWxsIHQoLnRydWUuLCAg J3BvaW50JywgJywnKSAhIE5vIGVycm9yIHNob3duCisgIGNhbGwgdCguZmFsc2UuLCAnY29t bWEnLCAnLicpICEgRXJyb3Igc2hvd24KKyAgY2FsbCB0KC5mYWxzZS4sICdwb2ludCcsICcu JykgISBFcnJvciBzaG93bgorICBjYWxsIHQoLmZhbHNlLiwgJ2NvbW1hJywgJzUuJykgISBF cnJvciBzaG93bgorICBjYWxsIHQoLmZhbHNlLiwgJ3BvaW50JywgJzUuJykgISBnZm9ydHJh bi9mbGFuZzogRXJyb3Igc2hvd24sIGlmb3J0OiBubyBlcnJvcgorICBjYWxsIHQoLmZhbHNl LiwgJ2NvbW1hJywgJzUsJykgISBnZm9ydHJhbjogZXJyb3I7IG90aGVyczogbm8gZXJyb3IK KyAgY2FsbCB0KC50cnVlLiwgICdwb2ludCcsICc1LCcpICEgTm8gZXJyb3Igc2hvd24KKyAg Y2FsbCB0KC50cnVlLiwgICdjb21tYScsICc1OycpICEgTm8gZXJyb3Igc2hvd24KKyAgY2Fs bCB0KC5mYWxzZS4sICdwb2ludCcsICc1OycpICEgLyFcIGdmb3J0cmFuOiBubyBlcnJvciBz aG93biwgb3RoZXJzOiBlcnJvcgorICBjYWxsIHQoLnRydWUuLCAgJ2NvbW1hJywgJzcgLicp ICEgTm8gZXJyb3Igc2hvd24KKyAgY2FsbCB0KC50cnVlLiwgICdwb2ludCcsICc3IC4nKSAh IE5vIGVycm9yIHNob3duCisgIGNhbGwgdCgudHJ1ZS4sICAnY29tbWEnLCAnNyAsJykgISAv IVwgZ2ZvcnRyYW46IGVycm9yOyBvdGhlcnM6IG5vIGVycm9yCisgIGNhbGwgdCgudHJ1ZS4s ICAncG9pbnQnLCAnNyAsJykgISBObyBlcnJvciBzaG93bgorICBjYWxsIHQoLnRydWUuLCAg J2NvbW1hJywgJzcgOycpICEgTm8gZXJyb3Igc2hvd24KKyAgY2FsbCB0KC50cnVlLiwgICdw b2ludCcsICc3IDsnKSAhIE5vIGVycm9yIHNob3duCisKKyEgIHByaW50ICosICctLS0tLS0t LS0tLS0tLS0nCisKKyAgY2FsbCB0KC5mYWxzZS4sICdjb21tYScsICc4LicsIC50cnVlLikg ISBFcnJvciBzaG93bgorICBjYWxsIHQoLnRydWUuLCAgJ3BvaW50JywgJzguJywgLnRydWUu KSAhIGdmb3J0cmFuL2ZsYW5nOiBFcnJvciBzaG93biwgaWZvcnQ6IG5vIGVycm9yCisgIGNh bGwgdCgudHJ1ZS4sICAnY29tbWEnLCAnOCwnLCAudHJ1ZS4pICEgZ2ZvcnRyYW46IGVycm9y OyBvdGhlcnM6IG5vIGVycm9yCisgIGNhbGwgdCgudHJ1ZS4sICAncG9pbnQnLCAnOCwnLCAu dHJ1ZS4pICEgTm8gZXJyb3Igc2hvd24KKyAgY2FsbCB0KC50cnVlLiwgICdjb21tYScsICc4 OycsIC50cnVlLikgISBObyBlcnJvciBzaG93bgorICBjYWxsIHQoLmZhbHNlLiwgJ3BvaW50 JywgJzg7JywgLnRydWUuKSAhIC8hXCBnZm9ydHJhbjogbm8gZXJyb3Igc2hvd24sIG90aGVy czogZXJyb3IKKyAgY2FsbCB0KC50cnVlLiwgICdjb21tYScsICc5IC4nLCAudHJ1ZS4pICEg Tm8gZXJyb3Igc2hvd24KKyAgY2FsbCB0KC50cnVlLiwgICdwb2ludCcsICc5IC4nLCAudHJ1 ZS4pICEgTm8gZXJyb3Igc2hvd24KKyAgY2FsbCB0KC50cnVlLiwgICdjb21tYScsICc5ICwn LCAudHJ1ZS4pICEgLyFcIGdmb3J0cmFuOiBlcnJvcjsgb3RoZXJzOiBubyBlcnJvcgorICBj YWxsIHQoLnRydWUuLCAgJ3BvaW50JywgJzkgLCcsIC50cnVlLikgISBObyBlcnJvciBzaG93 bgorICBjYWxsIHQoLnRydWUuLCAgJ2NvbW1hJywgJzkgOycsIC50cnVlLikgISBObyBlcnJv ciBzaG93bgorICBjYWxsIHQoLnRydWUuLCAgJ3BvaW50JywgJzkgOycsIC50cnVlLikgISBO byBlcnJvciBzaG93bgorICBjYWxsIHQoLmZhbHNlLiwgJ2NvbW1hJywgJzMsMy4nLCAudHJ1 ZS4pICEgRXJyb3Igc2hvd24KKyAgY2FsbCB0KC5mYWxzZS4sICdwb2ludCcsICczLjMuJywg LnRydWUuKSAhIEVycm9yIHNob3duCisgIGNhbGwgdCguZmFsc2UuLCAnY29tbWEnLCAnMywz LCcsIC50cnVlLikgISBnZm9ydHJhbi9mbGFuZzogbm8gZXJyb3I7IGlmb3J0OiBlcnJvcgor ICBjYWxsIHQoLnRydWUuLCAgJ2NvbW1hJywgJzMsMzsnLCAudHJ1ZS4pICEgTm8gZXJyb3Ig c2hvd24KKyAgY2FsbCB0KC5mYWxzZS4sICdwb2ludCcsICczLjM7JywgLnRydWUuKSAhIGdm b3J0cmFuL2ZsYW5nOiBubyBlcnJvcjsgaWZvcnQ6IGVycm9yCisgIGNhbGwgdCgudHJ1ZS4s ICAnY29tbWEnLCAnNCw0IC4nLCAudHJ1ZS4pICEgTiBlcnJvciBzaG93bgorICBjYWxsIHQo LnRydWUuLCAgJ3BvaW50JywgJzQuNCAuJywgLnRydWUuKSAhIE5vIGVycm9yIHNob3duCisg IGNhbGwgdCgudHJ1ZS4sICAnY29tbWEnLCAnNCw0ICwnLCAudHJ1ZS4pICEgLyFcIGdmb3J0 cmFuOiBlcnJvcjsgb3RoZXJzOiBubyBlcnJvcgorICBjYWxsIHQoLnRydWUuLCAgJ3BvaW50 JywgJzQuNCAsJywgLnRydWUuKSAhIE5vIGVycm9yIHNob3duCisgIGNhbGwgdCgudHJ1ZS4s ICAnY29tbWEnLCAnNCw0IDsnLCAudHJ1ZS4pICEgTm8gZXJyb3Igc2hvd24KKyAgY2FsbCB0 KC50cnVlLiwgICdwb2ludCcsICc0LjQgOycsIC50cnVlLikgISBObyBlcnJvciBzaG93bgor CishICBwcmludCAqLCAnLS0tLS0tLS0tLS0tLS0tJworCisgIGNhbGwgdCgudHJ1ZS4sICAn Y29tbWEnLCAnOCcsIC50cnVlLikKKyAgY2FsbCB0KC50cnVlLiwgICdwb2ludCcsICc4Jywg LnRydWUuKQorICBjYWxsIHQoLnRydWUuLCAgJ3BvaW50JywgJzkgOycsIC50cnVlLikKKyAg Y2FsbCB0KC50cnVlLiwgICdjb21tYScsICczOzMuJywgLnRydWUuKQorICBjYWxsIHQoLnRy dWUuLCAgJ3BvaW50JywgJzMsMy4nLCAudHJ1ZS4pCisgIGNhbGwgdCgudHJ1ZS4sICAnY29t bWEnLCAnMzszLCcsIC50cnVlLikKKyAgY2FsbCB0KC50cnVlLiwgICdjb21tYScsICczOzM7 JywgLnRydWUuKQorICBjYWxsIHQoLnRydWUuLCAgJ3BvaW50JywgJzMsMzsnLCAudHJ1ZS4p CisgIGNhbGwgdCgudHJ1ZS4sICAnY29tbWEnLCAnNDs0IC4nLCAudHJ1ZS4pCisgIGNhbGwg dCgudHJ1ZS4sICAncG9pbnQnLCAnNCw0IC4nLCAudHJ1ZS4pCisgIGNhbGwgdCgudHJ1ZS4s ICAnY29tbWEnLCAnNDs0ICwnLCAudHJ1ZS4pCisgIGNhbGwgdCgudHJ1ZS4sICAncG9pbnQn LCAnNCw0ICwnLCAudHJ1ZS4pCisgIGNhbGwgdCgudHJ1ZS4sICAnY29tbWEnLCAnNDs0IDsn LCAudHJ1ZS4pCisgIGNhbGwgdCgudHJ1ZS4sICAncG9pbnQnLCAnNCw0IDsnLCAudHJ1ZS4p Citjb250YWlucworc3Vicm91dGluZSB0KHZhbGlkLCBkZWMsIHRlc3RpbnB1dCwgaXNyZWFs KQorICBsb2dpY2FsLCB2YWx1ZSA6OiB2YWxpZAorICBjaGFyYWN0ZXIobGVuPSopIDo6IGRl YywgdGVzdGlucHV0CisgIGxvZ2ljYWwsIG9wdGlvbmFsIDo6IGlzcmVhbAorICBsb2dpY2Fs IDo6IGlzcmVhbDIKKyAgaW50ZWdlciBuLGlvcworICByZWFsIDo6IHIKKyAgciA9IDQyOyBu ID0gNDIKKyAgaXNyZWFsMiA9IC5mYWxzZS4KKyAgaWYgKHByZXNlbnQoaXNyZWFsKSkgaXNy ZWFsMiA9IGlzcmVhbAorCisgIGlmIChpc3JlYWwyKSB0aGVuCisgICAgcmVhZCh0ZXN0aW5w dXQsKixkZWNpbWFsPWRlYyxpb3N0YXQ9aW9zKSByCisgICAgaWYgKCh2YWxpZCAuYW5kLiBp b3MgLz0gMCkgLm9yLiAoLm5vdC52YWxpZCAuYW5kLiBpb3MgPT0gMCkpIHRoZW4KKyAgICAg IHByaW50ICcoKihnMCkpJywgdmFsaWQsICcsICcsIGRlYywnLCBpc3JlYWwgPSAnLGlzcmVh bDIsJywgdGVzdGlucHV0ID0gIicsdGVzdGlucHV0LCciJywnLCByPScsciwnIGlvcz0nLGlv cworICAgICAgcHJpbnQgKiwgJ0VSUk9SJworICAgICAgc3RvcCAxCisgICAgZW5kIGlmCisg IGVsc2UKKyAgICByZWFkKHRlc3RpbnB1dCwqLGRlY2ltYWw9ZGVjLGlvc3RhdD1pb3MpIG4K KyAgICBpZiAoKHZhbGlkIC5hbmQuIGlvcyAvPSAwKSAub3IuICgubm90LnZhbGlkIC5hbmQu IGlvcyA9PSAwKSkgdGhlbgorICAgICAgcHJpbnQgJygqKGcwKSknLCB2YWxpZCwgJywgJywg ZGVjLCcsIGlzcmVhbCA9ICcsaXNyZWFsMiwnLCB0ZXN0aW5wdXQgPSAiJyx0ZXN0aW5wdXQs JyInLCcsIG49JyxuLCcgaW9zPScsaW9zCisgICAgICBwcmludCAqLCAnRVJST1InCisgICAg ICBzdG9wIDEKKyAgICBlbmQgaWYKKyAgZW5kIGlmCitlbmQKK2VuZCBwcm9ncmFtCmRpZmYg LS1naXQgYS9saWJnZm9ydHJhbi9pby9saXN0X3JlYWQuYyBiL2xpYmdmb3J0cmFuL2lvL2xp c3RfcmVhZC5jCmluZGV4IGZiM2Y3ZGJjMzRkLi42YmY1OTMyOWFkZCAxMDA2NDQKLS0tIGEv bGliZ2ZvcnRyYW4vaW8vbGlzdF9yZWFkLmMKKysrIGIvbGliZ2ZvcnRyYW4vaW8vbGlzdF9y ZWFkLmMKQEAgLTQ2MSwxMSArNDYxLDMwIEBAIGVhdF9zZXBhcmF0b3IgKHN0X3BhcmFtZXRl cl9kdCAqZHRwKQogICBpbnQgYywgbjsKICAgaW50IGVyciA9IDA7CiAKLSAgZWF0X3NwYWNl cyAoZHRwKTsKICAgZHRwLT51LnAuY29tbWFfZmxhZyA9IDA7CisgIGMgPSBuZXh0X2NoYXIg KGR0cCk7CisgIGlmIChjID09ICcgJykKKyAgICB7CisgICAgICBlYXRfc3BhY2VzIChkdHAp OworICAgICAgYyA9IG5leHRfY2hhciAoZHRwKTsKKyAgICAgIGlmIChjID09ICcsJykKKwl7 CisJICBpZiAoZHRwLT51LnAuY3VycmVudF91bml0LT5kZWNpbWFsX3N0YXR1cyA9PSBERUNJ TUFMX0NPTU1BKQorCSAgICB1bmdldF9jaGFyIChkdHAsICc7Jyk7CisJICBkdHAtPnUucC5j b21tYV9mbGFnID0gMTsKKwkgIGVhdF9zcGFjZXMgKGR0cCk7CisJICByZXR1cm4gZXJyOwor CX0KKyAgICAgIGlmIChjID09ICc7JykKKwl7CisJICBpZiAoZHRwLT51LnAuY3VycmVudF91 bml0LT5kZWNpbWFsX3N0YXR1cyA9PSBERUNJTUFMX1BPSU5UKQorCSAgICB1bmdldF9jaGFy IChkdHAsICcsJyk7CisJICBkdHAtPnUucC5jb21tYV9mbGFnID0gMTsKKwkgIGVhdF9zcGFj ZXMgKGR0cCk7CisJICByZXR1cm4gZXJyOworCX0KKyAgICB9CiAKLSAgaWYgKChjID0gbmV4 dF9jaGFyIChkdHApKSA9PSBFT0YpCi0gICAgcmV0dXJuIExJQkVSUk9SX0VORDsKICAgc3dp dGNoIChjKQogICAgIHsKICAgICBjYXNlICcsJzoKQEAgLTQ3Niw4ICs0OTUsMTggQEAgZWF0 X3NlcGFyYXRvciAoc3RfcGFyYW1ldGVyX2R0ICpkdHApCiAJICB1bmdldF9jaGFyIChkdHAs IGMpOwogCSAgYnJlYWs7CiAJfQotICAgIC8qIEZhbGwgdGhyb3VnaC4gKi8KKyAgICAgIGR0 cC0+dS5wLmNvbW1hX2ZsYWcgPSAxOworICAgICAgZWF0X3NwYWNlcyAoZHRwKTsKKyAgICAg IGJyZWFrOworCiAgICAgY2FzZSAnOyc6CisgICAgICBpZiAoZHRwLT51LnAuY3VycmVudF91 bml0LT5kZWNpbWFsX3N0YXR1cyA9PSBERUNJTUFMX1BPSU5UKQorCXsKKwkgIGdlbmVyYXRl X2Vycm9yICgmZHRwLT5jb21tb24sIExJQkVSUk9SX1JFQURfVkFMVUUsCisJICAgIlNlbWlj b2xvbiBub3QgYWxsb3dlZCBhcyBzZXBhcmF0b3Igd2l0aCBERUNJTUFMPSdwb2ludCciKTsK KwkgIHVuZ2V0X2NoYXIgKGR0cCwgYyk7CisJICBicmVhazsKKwl9CiAgICAgICBkdHAtPnUu cC5jb21tYV9mbGFnID0gMTsKICAgICAgIGVhdF9zcGFjZXMgKGR0cCk7CiAgICAgICBicmVh azsK --------------jdYFLQG92OEgEnsohlEQoFVX--