From 48b16204aeeda5bc1f87e49c6b8e23d9abb07c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Wed, 30 Jul 2014 09:59:37 +0300
Subject: main/musl: fix getconf to print single values

It is not valid to use positional parameters without using them all.
Otherwise the proper argument size cannot be determined. ref #3266
---
 main/musl/APKBUILD  |  8 ++++----
 main/musl/getconf.c | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'main')

diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index c83126ec4..da37aac38 100644
--- a/main/musl/APKBUILD
+++ b/main/musl/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=musl
 pkgver=1.1.3
-pkgrel=4
+pkgrel=5
 pkgdesc="the musl c library (libc) implementation"
 url="http://www.musl-libc.org/"
 arch="all"
@@ -141,7 +141,7 @@ f77891cda55e2f54567814eff91934c0  0009-fix-crash-in-regexec-for-nonzero-nmatch-a
 013be8897f27c3909ada59c62020502f  ldconfig
 61c6c1e84ed1df82abbe6d75e90cf21c  getopt_long.c
 0df687757221bbb0fc1aa67f1bd646f9  __stack_chk_fail_local.c
-cb82d21fed17a116b44b830adba71c5a  getconf.c
+57ef2c63b9ec6a2041694ace97d4ffa2  getconf.c
 2b941c4251cac44988a4abfc50e21267  getent.c
 45f92f8d59cf84d765de698a9578dbf4  iconv.c"
 sha256sums="4ef8a7559b947808d41dbea98e24d9f36be38326fb2754a91a35520b4ca4af9f  musl-1.1.3.tar.gz
@@ -160,7 +160,7 @@ fb542c2bd5081ff2f601c519edb3dac8f54ca5c888f44bc6cfb84e6565472025  1003-remove-ul
 398dc26ec82cc6af056c738e8ac62da212ba978229d9839eb8b61f7ce536da4a  ldconfig
 d9b644ec20bc33e81a7c52b9fcf7973d835923a69faf50f03db45534b811bd96  getopt_long.c
 299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da  __stack_chk_fail_local.c
-1b540709f83b7b9a03073b39066810fdb90537d840b50c2016a84bedce038606  getconf.c
+d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c  getconf.c
 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd7607134bbe  getent.c
 f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7  iconv.c"
 sha512sums="c580c700d609eced15dc398ff6dcbc2e38fab24eaa5ea80a58c3d41d9f749579cce328bbad149f2b5975533d6ec051e6cc08be3bea4d65e143fc850745bf24c2  musl-1.1.3.tar.gz
@@ -179,6 +179,6 @@ dae010b45419fcab64410568466f659cdc874e63113025e2cbc2fbab047b470fec23851ecbef0888
 33e13d2242063f3dc9ec199ae9528e469a52ccae4d3726faa3c866e0c7dcf546f69294f9c00307324cee05fd965f84350ae100b8b1138f9d9c8c916de04ab0d1  ldconfig
 140f3f20d30bd95ebce8c41b8cc7f616c6cbedf4ea06c729c21014e74f6043796825cc40ebc5180620ea38173afdba23f09ebf6d8b11fa05440b14d23764fca9  getopt_long.c
 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b  __stack_chk_fail_local.c
-06064adfb4dfb45257857113b3f342f77201685f6d3b8e64e203ff618dbb254e7ecb65ecc2d108395f27154825396251b3cfbc678d197d590d93cf79ac5cb56d  getconf.c
+0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d  getconf.c
 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2  getent.c
 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf  iconv.c"
diff --git a/main/musl/getconf.c b/main/musl/getconf.c
index 0c511c085..c4235242b 100644
--- a/main/musl/getconf.c
+++ b/main/musl/getconf.c
@@ -207,20 +207,20 @@ static void usage(const char *p)
 
 static void print_long(const char *name, long val)
 {
-	static const char * const fmtstr[] = { "%2$ld\n", "%s = %ld\n" };
-	printf(fmtstr[all], name, val);
+	if (all) printf("%s = %ld\n", name, val);
+	else printf("%ld\n", val);
 }
 
 static void print_ulong(const char *name, unsigned long val)
 {
-	static const char * const fmtstr[] = { "%2$lu\n", "%s = %lu\n" };
-	printf(fmtstr[all], name, val);
+	if (all) printf("%s = %lu\n", name, val);
+	else printf("%lu\n", val);
 }
 
 static void print_string(const char *name, const char *val)
 {
-	static const char * const fmtstr[] = { "%2$s\n", "%s = %s\n" };
-	printf(fmtstr[all], name, val);
+	if (all) printf("%s = %s\n", name, val);
+	else printf("%s\n", val);
 }
 
 static int print_constant(const struct conf_variable *cp, const char *pathname)
-- 
cgit v1.2.3