From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6005 invoked by alias); 4 May 2017 15:56:37 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 5990 invoked by uid 89); 4 May 2017 15:56:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy= X-Spam-Status: No, score=-25.8 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: EUR03-VE1-obe.outbound.protection.outlook.com Received: from mail-eopbgr50130.outbound.protection.outlook.com (HELO EUR03-VE1-obe.outbound.protection.outlook.com) (40.107.5.130) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 May 2017 15:56:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qtcompany.onmicrosoft.com; s=selector1-qt-io; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=to2WajPydpEr1sDJJnLQwL2dk7KZ9ZFelI/8DnU1ZiA=; b=JQW+tZLgGBNzA5trM7/UWc2FKP4tpoxn6C0FRy5oHntxVdcQsemQvCR0liM1FDEfwvSlFZMFEgSHCmJs79LfYHdM9v1NaIwnFQXjc5Zpw0fKlUnknjpj1NnPYPPrj1XdG+rwbi2jCsHHVfEIGK5srdyxGJiDqHejSSHe9visy+I= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ulf.hermann@qt.io; Received: from [10.9.78.56] (62.220.2.194) by AMSPR02MB231.eurprd02.prod.outlook.com (2a01:111:e400:8022::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12; Thu, 4 May 2017 15:56:34 +0000 From: Ulf Hermann Subject: [PATCH] Use octal numbers rather than permission macros To: Message-ID: <35b0c41e-42f2-e998-1725-16d7a085312a@qt.io> Date: Thu, 04 May 2017 16:05:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [62.220.2.194] X-ClientProxiedBy: DB6PR0802CA0044.eurprd08.prod.outlook.com (2603:10a6:4:a3::30) To AMSPR02MB231.eurprd02.prod.outlook.com (2a01:111:e400:8022::22) X-MS-Office365-Filtering-Correlation-Id: ac79dc0c-d2f3-447e-4497-08d493062393 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075);SRVR:AMSPR02MB231; X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB231;3:Sdo1/cO81Ozu8syqkhhAFPkvmbNonnODZQkq4RQ9sh64gXfnjGvn9Ix/x+dolWM5KHBIybF56Kf2KS+2M0UoRamFNI8yR25fRaqPwOKLQBTIVhi+UfJYlfHyWFhQXlZoKKwRl43KkPUBDcCFRy0h/kYiQZ+UQB2AJEup8NaPDXSV4LvcdlxzSUPm9NEnYoHNy2Ltlw0B/kU3RS4xcJGJF7ic0w/6yfvXRUbOqqUTBboLYOWDV8m+IoLFwXnqRx/+K0BmSv7YKadD2738L/J4ZvNb7AyxM2d2HpqfKDatxAN10K3N6F6Cd7BDhacJvuNU;25:Uu+138Tua9T9+2I/qPUC0JkSQhAvovbUTFu+0Oso/83n1mYI4KuiMl2Ro6jJu2zzshycB2aAhktUjPlaHPNkII/faHO81hAeulD2BhKVzBTdD3COrwvfZZZiML+fNiPw/LBCrqOapBEjb4LawclUN4nkz7ts4kBq4DYO78tUasz07+hJh7ST2wtjzy/fQ6XOOxKneYkMg+EYW0qM4YpOtIBWNs5TFk4RjIgWTVXrr17NTBLi0c1tFZIy+kH+pOOxnD8O7UOhLLd8OLTLA+Byhkr7PTtph4Z8dCEeJrBKEEc/abDtbmA7raV5FSXCOXEG5FWl1oHV83bmNfONnlgbMgalliuAB2Pp7vU4B+MK8xLIviQLnDLXexJ6fnCnDh8gpDZKS71Eg1n1meA8+9vqKqHT1r81A1aJsUSmTKygBN33piHYPExgEn1Rp4N7ZFDjJBirE6fJ/tq2oyZPutT+8g== X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB231;31:0G/jTffzITLLJSGNoCsL8855/9Uu7OfOpInl2OTFVEhm/0v4iu1pYUT1ESS743A7HPSjthSBo6FQuxXZmLZCWZEyyr3qhhdLjFa+MyGPZ4aja9bcKvNg0Zozufu3eiN1kd4JhEKX0fD+G0J9vE8i3RLPB/eBLQSzlzJyUiwdwiEMFFfTjE1s/M4h35E5UBhuniST6abyMYMwUGkY7hQLUFSg8x/8l+YGLXh7U5Z5guU02lkBDY2QJhMtTKlqP5Lpe4qV/fev2jw5EE6KupWq7U+0oz7qM7a7RARPtnjzPzM=;20:/XBlpFdXYEj2DZMPFloOPy27NJfksBzQsF4dtuqJ4sd8fJ+kI5TOLhMyWbcQN3Su0gakONPnVOWAgqfs5hBi/xX19T54AADhwvgtxxWVkH1mi4kw7D4krW8bxiJxqFEj4tp3n/dqZPLwmJqUkYWfxq2zOuWXLEO0Q3Kb3dwR6krPkI6mwoXEJMkNBB0GViTnC+eWMIfK8XgrDs8BF5pxx3GmtXxhfB8BkRqfipdIIfiWp1k+dkA+fgzo7ankNdW5 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(6041248)(20161123555025)(2016111802025)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(6043046)(6072148);SRVR:AMSPR02MB231;BCL:0;PCL:0;RULEID:;SRVR:AMSPR02MB231; X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB231;4:RPN80v0GPl0JqqV8Q6g8Viw8NJPIW1FBdpvgKdDR/r+sQqBaXpVhDxBekVotsDFfLa2bDQCBDs8727UuPwEr23xNjSBPAR9KOVNOH9H6LHJNum98Lh95OOg6HVwVsEiP2K9+eYLsueuvhwjwKOMpzOMyOrjjLi0idITZjhQy7rqyPiKs3VOyhREb9zWHhYW4BiEqQDy8j65U+/TOxZXu1bHxyauUUllJt2yEXwB5AGa2rIrvmLWBrtVOQ/1gjb80wy7FshKxoIeymYxsLkpvJVxMspx7CLl7rpw0T/iVnchZOWn0+e+5Q7Z2yBKURSdh7SIIpBfmVxwwGfGBFv2YySaAM6Skp5+9aMMHNdPySjozhvB54MekFkJS3NTT6+9t9eM0PYr4nYaqJbb28TqbmTUC9WrWiVbZFkDkxEVGBhGjuJ4Gu+TrfGfvkJSYWvbih8PedK/U+hhnpnAYbs5IklZCJzEHdXlLAO9YjL0Ya8BErrgOrkFS9ZJftWbPOhqm3BBCE/N0yVed10IGP0uShjMn6E4gJbM/QEPN8RJD4ghbNsAlg1xdd3KrNkIZ1rmI4THegbWH74TXXx/6wG3qWpf3nvCUt+Ru/Mt09psbAG5lIkgupOLldY+Z9gnL5fsmAj5QNsSJlP6hfAbR3+Tq2XZnM2Yn8uOwDJ3GfkPQskH5Kxewo7Jd+MOef4vh3trKxPSKgbBgtKBpDu06euuN39mZHl0wzsMpWt1lJpspJCyMq6jfZQlOy3bAydex4+1zPvqZ6YEZ45T06wt6UUoeCc+nn86/cimHFelJJ2HLc85rrFPdfyjcIT6qqtbugGvlFHmWB5rHXN5ZdSc+vGdfxg== X-Forefront-PRVS: 02973C87BC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(979002)(6009001)(6049001)(39400400002)(39410400002)(39840400002)(39450400003)(377424004)(54534003)(25786009)(65806001)(65956001)(31696002)(110136004)(83506001)(86362001)(38730400002)(36756003)(81166006)(8676002)(50466002)(47776003)(6116002)(74482002)(2351001)(66066001)(230700001)(3846002)(53936002)(2906002)(23676002)(33646002)(50986999)(54356999)(305945005)(478600001)(65826007)(42186005)(5660300001)(4001350100001)(31686004)(7736002)(6486002)(77096006)(189998001)(64126003)(6916009)(6666003)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1102;SCL:1;SRVR:AMSPR02MB231;H:[10.9.78.56];FPR:;SPF:None;MLV:ovrnspm;PTR:InfoNoRecords;LANG:en; Received-SPF: None (protection.outlook.com: qt.io does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTVNQUjAyTUIyMzE7MjM6d3BTR0RiYTlKSmoyVDduL21oY2l5UTd1QzRC?= =?utf-8?B?WTdEaXIvU21tY0NwT3N0QWNxUFd2Z29SaW51cGFlWWNwRUNTdUVLM0EvSWdi?= =?utf-8?B?N3E4MTkybVB6Mm1Xd2k5OUJXS3dieldvOWM1eFBaeFVyK2hCMm02SzRXWDRP?= =?utf-8?B?dk0xNXMzaFlVSWo0OHJwdDVYbUdxNUxNSCtIMjc3dmtZWUZSSUNjd2hybHN3?= =?utf-8?B?T2JKQ1l5bHBnWUQxNXhLQTZ4TjdwWExscTgveVJRci8ySHJxb21IT08xRGQx?= =?utf-8?B?QU10aFhHUU5ROEZtK1l1eVoxc2xqOXZRaTM4ZFltR05NM3R0cE9uUzlCNmgw?= =?utf-8?B?cy83VUFpOEk0aW5BQ1VsSFM4UjlST2ovTHR0VEJteFZNMTZ1OFBVUkVuUGk1?= =?utf-8?B?aFk3YlRJVlBia1NOZ1V2RjFtTkVDRzBOS0xnMWtLcGFiOTBQaWJabTdHQ1ZX?= =?utf-8?B?ZE5kV3hBQ0xMdkdyQ3RpL3lYMHdCV3BHK3NkQkw3V28zTC9FQWVJT0p5cHNq?= =?utf-8?B?UXI1NEVTSjJ0ZzF5VGorVmU4c3ZWOUJqSzRUS2Z3aXA2YlVtK2I3MmlsQ0NU?= =?utf-8?B?RkxjMFI1c3BCQnFHZDA4YXhrTDNxdStRTUdSazRpWGNGcFZYTTJDQk5iUHVu?= =?utf-8?B?QTVBUlEvRTd3bTNLMWlTV2dJNGJJeVZuYVVCL2F0QlNjVStpQ3Q5SURqUmlH?= =?utf-8?B?Q2dkclNNODc4Z3U0MkFIVzRqWUx2WTA0cnpSZExJZTFESTdESGZwSWl1WTU1?= =?utf-8?B?UVB6alIyN3RLcVU3M1UyVTBSelg0dkc3WmxpbSswcG9lZFVNVjdLdFJ3UFhQ?= =?utf-8?B?Sk9FUU1yM094M3FOczZTWEV6ejliQ0JIenliRmpMdS9mNkRxNGVMaTMxaTVz?= =?utf-8?B?N2s2SlV0SW5vMWk1NlQreUVEcnI0L3Nhb2dFTVZ0bmgweVYyNFp4NHdwUmty?= =?utf-8?B?cnhuTHdDWFZ0SUZIVTFZY3FETFYwdzhHeGJ2N3lBQW5wYmFZU3VzT3dXQjNL?= =?utf-8?B?U2toM0tXQ0dCOGN5TFFVays4dC9vR05Rcmg0QWNsRDhvc2RCZGM3QTE4c01F?= =?utf-8?B?TWFLeUxEcEVvTlRDdEVVQmpRVmJUc3RUVS9Ta1hxNmJSSU12NTJOQm9hN3l6?= =?utf-8?B?VGMxdWJxNGtwQzdnbUxVRERnOXFMWGxoc3BPOU1oelNXV0l3NVJSSzhaTndQ?= =?utf-8?B?S1JCL1NKd2h5MWxmODR3enVyWVFiSkt6OTNGVTN3RTdjQ1RqbDZsWnM1VW4y?= =?utf-8?B?YVRzUnI3b2g2bUJ5ZXk0bzFhQ1V0UDBmdVFlNnFSWTRId3NtT2pyTWo4aFpU?= =?utf-8?B?cXFBVkh1VXFWblRhT1JHVVNJQ2ptVk9Nb2xUcG9qWUR0dzZOWmQ2dkMzc1lu?= =?utf-8?B?V0NVcWVYV0Jzc1RONnN6RW9JRzdoejBCWFYvVjlEMXFwV3ZrT29DWkg1Zyt6?= =?utf-8?B?TDBNS1RUL1NSMlcyakNzQ3NzSFZIWVdjUmJWT2dRVFdXZHY4UDgwY1FhOXZy?= =?utf-8?B?K2xrY0N0VHY3VzJwV29GSUdpQWJLSDRIRXdMWmJ0WktoM1kyUDNzdG9yVVVU?= =?utf-8?B?OW9ucGpRSlFaVGM4ejlpbVhuU2Nzem5wcEM0QUV4NE9FV1o1cTdHUkpYRTdF?= =?utf-8?B?OXdnQXBCcHJLSnBLUWJDenVjSGxrbldQN0V6Y2NmRmd3N1k5ZEVvamx4Wm5Y?= =?utf-8?B?WElHUDE5akdRUlMxNFRCWk5BckJjV1N0TFEreXJUT2M4K2FqbmJNZnJiNWtC?= =?utf-8?B?bk0zem1XdnNqU2x0NkZBPT0=?= X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB231;6:DF/96lJoUr/Yu5ofxXncH2D/cix6ZnnQPEX3UAWKHn8T8yxdRoZaRx8aXsgEo+GhwbLzCqxGldalVFm8b2jhLBVfMXiFTY6+ePxSR+9Ckp2tnLik7pYy/99Q8HfDtHDAIGbhyKlQlVYT9Dker08or/8Z4k0hV+QmVWhzTKD1pxjSzaJ/lRCIi2zw+10QHy4n5zHVOuq7NokaaOTaJ5govF5lADloYijs7FKm6IF7emCYrt7TUYftpI2ZlHtsVt2b9LCNAgeVqFkacsuRWSQ+rmnEeSMmFzrvl95cb0m85tSk3AtBcjaGYVR2plGJZnf8BiuUzVjS0fEfXhv4buQt1fqsvqv+SP1l+AcutsUt/AiITL48Py3NqbZo3R+KL0EnGAHOp1bdEsJlm/txXTzTm7Bu3np/gkz5zYm546QoheqgRw9vDv16id8l6/pO93JD5W4iQd/jx0HXydH6igxbHrBrUxgw0UNyqgF03Av1eUJmrzG/aDLKv+hZiVjiqvoZIbAxBaV79Az1qYCXJ/qz5Q==;5:y/4iL0MoR+8IX0Lr5itZwYGSpE+PlR/H037KD84Eh2otmeTY57g7DFEuoDAfd5XBPpknKp1mcnVF95y6tOuOoJiSKQNKv0BIy9KKoFA9hbaufuv4ayXAXQeHO6W99Ot1/BZAk/Y2lPiXWdGRX55cOQ==;24:9OruE5s4FGLpfzZSO+YZno/azqpBkcO/O5FOql/6noz1z9H2UpUyN8QTVFBd7sNVZCmr1+o9TV8M8yahZ1mrlOB4qTD2zaPNm415nBQ9ayk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB231;7:/M1xsUUOSmRMdKQGcj40qpy6+cp3B3pdXkRaNiKU7U2h+1SAfIupJ7ZZ2pTujCj0P3bbQMETV68iNOh8Xqymb3u+ssyNLgFAxHj6/UlaLjm9gW7vfnJrapM2nzDux9d3Jk952upbq6THwABpkcAh64KDl4BzuHJUeHxMkzttNcS0rJwILSqwieJan9zPhbQQ5WTQKWWGrMzlKn4qqgG9T5Hpqxfemzp0pJoN2+sHf4w31PYXBhV4NIbpu42YwYFZRQ5OmNg4SytDvKk3jSJGpBf89OCbPGaJ4mdd4kTtYCsngNePYkMiSyykDJ40jyY7wqvEgEBU77GKy6Lv3rhtGw== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 15:56:34.0432 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR02MB231 X-IsSubscribed: yes X-SW-Source: 2017-q2/txt/msg00180.txt.bz2 The permission macros are not guaranteed to be defined and the octal numbers are rather well known. Signed-off-by: Ulf Hermann --- src/ChangeLog | 7 +++++++ src/ar.c | 8 ++++---- src/elfcompress.c | 4 ++-- src/ranlib.c | 2 +- src/strip.c | 2 +- tests/ChangeLog | 4 ++++ tests/elfstrmerge.c | 4 ++-- 7 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 44b4395..15cd55f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2017-05-04 Ulf Hermann + * ar.c: Use octal numbers instead of permission macros. + * elfcompress.c: Likewise. + * ranlib.c: Likewise. + * strip.c: Likewise. + +2017-05-04 Ulf Hermann + * unstrip.c: Use strndup and free instead of strndupa. 2017-05-04 Ulf Hermann diff --git a/src/ar.c b/src/ar.c index 91391b1..cc47f10 100644 --- a/src/ar.c +++ b/src/ar.c @@ -799,7 +799,7 @@ cannot rename temporary file to %.*s"), #if HAVE_DECL_FCHMOD /* Set the mode of the new file to the same values the original file has. */ - fchmod (newfd, st.st_mode & ALLPERMS) != 0 || + fchmod (newfd, st.st_mode & 07777) != 0 || #endif ( #if HAVE_DECL_FCHOWN @@ -1057,7 +1057,7 @@ do_oper_delete (const char *arfname, char **argv, int argc, #if HAVE_DECL_FCHMOD /* Set the mode of the new file to the same values the original file has. */ - fchmod (newfd, st.st_mode & ALLPERMS) != 0 || + fchmod (newfd, st.st_mode & 07777) != 0 || #endif ( #if HAVE_DECL_FCHOWN @@ -1399,7 +1399,7 @@ do_oper_insert (int oper, const char *arfname, char **argv, int argc, newfd = mkstemp (tmpfname); else { - newfd = open (arfname, O_RDWR | O_BINARY | O_CREAT | O_EXCL, DEFFILEMODE); + newfd = open (arfname, O_RDWR | O_BINARY | O_CREAT | O_EXCL, 0666); if (newfd == -1 && errno == EEXIST) /* Bah, first the file did not exist, now it does. Restart. */ return do_oper_insert (oper, arfname, argv, argc, member); @@ -1521,7 +1521,7 @@ do_oper_insert (int oper, const char *arfname, char **argv, int argc, #if HAVE_DECL_FCHMOD /* Set the mode of the new file to the same values the original file has. */ - fchmod (newfd, st.st_mode & ALLPERMS) != 0 || + fchmod (newfd, st.st_mode & 07777) != 0 || #endif ( #if HAVE_DECL_FCHOWN diff --git a/src/elfcompress.c b/src/elfcompress.c index 5dbeb57..6080db7 100644 --- a/src/elfcompress.c +++ b/src/elfcompress.c @@ -542,7 +542,7 @@ process_file (const char *fname) else { fnew = xstrdup (foutput); - fdnew = open (fnew, O_WRONLY | O_BINARY | O_CREAT, st.st_mode & ALLPERMS); + fdnew = open (fnew, O_WRONLY | O_BINARY | O_CREAT, st.st_mode & 07777); } if (fdnew < 0) @@ -1237,7 +1237,7 @@ process_file (const char *fname) #if HAVE_DECL_FCHMOD /* Try to match mode and owner.group of the original file. */ - if (fchmod (fdnew, st.st_mode & ALLPERMS) != 0) + if (fchmod (fdnew, st.st_mode & 07777) != 0) if (verbose >= 0) error (0, errno, "Couldn't fchmod %s", fnew); #endif diff --git a/src/ranlib.c b/src/ranlib.c index 41057de..22aac28 100644 --- a/src/ranlib.c +++ b/src/ranlib.c @@ -261,7 +261,7 @@ handle_file (const char *fname) #if HAVE_DECL_FCHMOD /* Set the mode of the new file to the same values the original file has. */ - fchmod (newfd, st.st_mode & ALLPERMS) != 0 || + fchmod (newfd, st.st_mode & 07777) != 0 || #endif ( #if HAVE_DECL_FCHOWN diff --git a/src/strip.c b/src/strip.c index 60f6700..14d2249 100644 --- a/src/strip.c +++ b/src/strip.c @@ -347,7 +347,7 @@ process_file (const char *fname) switch (elf_kind (elf)) { case ELF_K_ELF: - result = handle_elf (fd, elf, NULL, fname, st.st_mode & ACCESSPERMS, + result = handle_elf (fd, elf, NULL, fname, st.st_mode & 0777, preserve_dates ? tv : NULL); break; diff --git a/tests/ChangeLog b/tests/ChangeLog index fef6f55..9c04404 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,9 @@ 2017-05-04 Ulf Hermann + * elfstrmerge.c: Use 07777 instead of ALLPERMS. + +2017-05-04 Ulf Hermann + * elfshphehdr.c: For writing, use /dev/null rather than /dev/zero. 2017-05-04 Ulf Hermann diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c index ff15f57..5405ed8 100644 --- a/tests/elfstrmerge.c +++ b/tests/elfstrmerge.c @@ -367,7 +367,7 @@ main (int argc, char **argv) else { fnew = argv[2]; - fdnew = open (fnew, O_WRONLY | O_CREAT | O_BINARY, st.st_mode & ALLPERMS); + fdnew = open (fnew, O_WRONLY | O_CREAT | O_BINARY, st.st_mode & 07777); } if (fdnew < 0) @@ -652,7 +652,7 @@ main (int argc, char **argv) #if HAVE_DECL_FCHMOD /* Try to match mode and owner.group of the original file. */ - if (fchmod (fdnew, st.st_mode & ALLPERMS) != 0) + if (fchmod (fdnew, st.st_mode & 07777) != 0) error (0, errno, "Couldn't fchmod %s", fnew); #endif #if HAVE_DECL_FCHOWN -- 2.1.4