[PATCH 0/27] preparation to release some time soon

[PATCH 0/27] preparation to release some time soon

[Sami Kerola]

Hello,

This is just a review submission of my all recent pull request patches.
Karel proposed I should do in IRC:

21:40 < kzak> kerolasa: it would be nice to send the patches
              independently to the list, (as well as important things 
              from your -Wshadow branch)

The last 5 patches appear first time in the list, and some of them are
quit relevant get next release on track.  IMHO the important patches
are;

[PATCH 1/3] tests: partx changed default output format
[PATCH 2/3] tests: look: add words file
[PATCH 3/3] tests: fdisk: change expected test output
[PATCH 1/5] ddate: russian manual missing from package
[PATCH 3/5] wdctl: fix conflicting types on old systems
[PATCH 4/5] dmesg: inform user when klogctl() or read_buffer() fails

Everything else is in 'would be nice to have' category.

Patches are also available in my git, which some may favour as delivery
method more than email.

git://github.com/kerolasa/lelux-utiliteetit.git test-fixes
git://github.com/kerolasa/lelux-utiliteetit.git 2012wk29
git://github.com/kerolasa/lelux-utiliteetit.git 2012wk30

I think in future I will send the pull requests format 'git send-email 
--compose' cover letter.  Without doubt doing this is noisier than  
sending only pull request, but hopefully makes review more transparent.
Lets try for few times, and if this works the method should probably be
documented in Documentation/howto-contribute.txt as preferred way to
send pull request.  What do you think, does this make sense, help
review, etc, comments?

[PATCH 1/3] tests: partx changed default output format

[Sami Kerola]

Reference: commit 7cfd1b26437acd45f1e2e75c9648afabb8f5b2da
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 tests/expected/partx/partx-bsd     |  5 +++--
 tests/expected/partx/partx-dos+bsd |  9 +++++----
 tests/expected/partx/partx-gpt     | 11 ++++++-----
 tests/expected/partx/partx-sgi     |  5 +++--
 tests/expected/partx/partx-sun     |  5 +++--
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/tests/expected/partx/partx-bsd b/tests/expected/partx/partx-bsd
index d4be5c5..15568c4 100644
--- a/tests/expected/partx/partx-bsd
+++ b/tests/expected/partx/partx-bsd
@@ -1,2 +1,3 @@
-# 1:      7936-    12799 (     4864 sectors,      2 MB)
-# 2:     12544-    16127 (     3584 sectors,      1 MB)
+NR START   END SECTORS SIZE NAME UUID
+ 1  7936 12799    4864 2.4M      
+ 2 12544 16127    3584 1.8M      
diff --git a/tests/expected/partx/partx-dos+bsd b/tests/expected/partx/partx-dos+bsd
index 3242a6c..75cdfe8 100644
--- a/tests/expected/partx/partx-dos+bsd
+++ b/tests/expected/partx/partx-dos+bsd
@@ -1,4 +1,5 @@
-# 1:        32-     7679 (     7648 sectors,      3 MB)
-# 2:      7680-    16383 (     8704 sectors,      4 MB)
-# 5:      7936-    12799 (     4864 sectors,      2 MB)
-# 6:     12544-    16127 (     3584 sectors,      1 MB)
+NR START   END SECTORS SIZE NAME UUID
+ 1    32  7679    7648 3.8M      
+ 2  7680 16383    8704 4.3M      
+ 5  7936 12799    4864 2.4M      
+ 6 12544 16127    3584 1.8M      
diff --git a/tests/expected/partx/partx-gpt b/tests/expected/partx/partx-gpt
index 0a1d491..c941f36 100644
--- a/tests/expected/partx/partx-gpt
+++ b/tests/expected/partx/partx-gpt
@@ -1,5 +1,6 @@
-# 1:        34-     2047 (     2014 sectors,      1 MB)
-# 2:      2048-     4095 (     2048 sectors,      1 MB)
-# 3:      4096-     6143 (     2048 sectors,      1 MB)
-# 4:      6144-     8191 (     2048 sectors,      1 MB)
-# 5:      8192-    10239 (     2048 sectors,      1 MB)
+NR START   END SECTORS  SIZE NAME            UUID
+ 1    34  2047    2014 1007K ThisIsName      1dcf10bc-637e-4c52-8203-087ae10a820b
+ 2  2048  4095    2048    1M ThisIsOtherName a1d03a96-7238-46c6-bbb3-789cbe173ec7
+ 3  4096  6143    2048    1M primary         a7101b6c-468c-47df-aff6-cd444d12af61
+ 4  6144  8191    2048    1M primary         afc4950a-f0f1-4add-802c-5957133486d1
+ 5  8192 10239    2048    1M primary         0db0a787-c16b-4886-af3a-fbb97299677c
diff --git a/tests/expected/partx/partx-sgi b/tests/expected/partx/partx-sgi
index 469d442..ba357e0 100644
--- a/tests/expected/partx/partx-sgi
+++ b/tests/expected/partx/partx-sgi
@@ -1,2 +1,3 @@
-# 1:        63-  1606499 (  1606437 sectors,    822 MB)
-# 2:   1606500- 32129999 ( 30523500 sectors,  15628 MB)
+NR   START      END  SECTORS   SIZE NAME UUID
+ 1      63  1606499  1606437 784.4M      
+ 2 1606500 32129999 30523500  14.6G      
diff --git a/tests/expected/partx/partx-sun b/tests/expected/partx/partx-sun
index d957f58..e69fdb1 100644
--- a/tests/expected/partx/partx-sun
+++ b/tests/expected/partx/partx-sun
@@ -1,2 +1,3 @@
-# 1:         0-    87379 (    87380 sectors,     44 MB)
-# 2:     87380-   131069 (    43690 sectors,     22 MB)
+NR START    END SECTORS  SIZE NAME UUID
+ 1     0  87379   87380 42.7M      
+ 2 87380 131069   43690 21.3M      
-- 
1.7.11.3

[PATCH 2/3] tests: look: add words file

[Sami Kerola]

Archlinux words 2.0-4 package does not have 'apple-pie' in words file.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 tests/ts/look/separator | 4 +---
 tests/ts/look/words     | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 tests/ts/look/words

diff --git a/tests/ts/look/separator b/tests/ts/look/separator
index 17d68db..51e96c9 100755
--- a/tests/ts/look/separator
+++ b/tests/ts/look/separator
@@ -34,8 +34,6 @@ TS_DESC="separator"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-[ -f "/usr/share/dict/words" ] || ts_skip "/usr/share/dict/words not such file"
-
-$TS_CMD_LOOK apple-pie >> $TS_OUTPUT
+$TS_CMD_LOOK apple-pie $TS_TOPDIR/ts/look/words >> $TS_OUTPUT
 ts_finalize
 
diff --git a/tests/ts/look/words b/tests/ts/look/words
new file mode 100644
index 0000000..b67ba9a
--- /dev/null
+++ b/tests/ts/look/words
@@ -0,0 +1,3 @@
+apple
+apple-pie
+oranges
-- 
1.7.11.3

[PATCH 3/3] tests: fdisk: change expected test output

[Sami Kerola]

Align with commit 289dcc90234680063a336925a99d1ef04e97cbda.  The check
will work for now.  Notice that the fdisk check will probably get more
changes in near future, see reference for more information.

Reference: http://marc.info/?l=util-linux-ng&m=134251966722938&w=2
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 tests/expected/fdisk/oddinput | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/expected/fdisk/oddinput b/tests/expected/fdisk/oddinput
index d90866b..bc9952b 100644
--- a/tests/expected/fdisk/oddinput
+++ b/tests/expected/fdisk/oddinput
@@ -9,6 +9,6 @@ Sector size (logical/physical): 512 bytes / 512 bytes
 I/O size (minimum/optimal): 512 bytes / 512 bytes
 
 Nonexistant file
-lt-fdisk: unable to open _a_file_that_does_not_exist_: No such file or directory
+lt-fdisk: cannot open _a_file_that_does_not_exist_: No such file or directory
 Too small file
-lt-fdisk: unable to open oddinput.toosmall: Success
+lt-fdisk: cannot open oddinput.toosmall: Success
-- 
1.7.11.3

[PATCH 01/19] mkswap: fix shadow declaration

[Sami Kerola]

disk-utils/mkswap.c:366:57: warning: declaration of 'is_blkdev' shadows a global declaration [-Wshadow]
./include/blkdev.h:92:5: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 disk-utils/mkswap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index ca49d0e..34fe687 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -363,7 +363,7 @@ new_prober(int fd)
 #endif
 
 static void
-wipe_device(int fd, const char *devname, int force, int is_blkdev)
+wipe_device(int fd, const char *devname, int force, int is_blkdevice)
 {
 	char *type = NULL;
 	int whole = 0;
@@ -375,7 +375,7 @@ wipe_device(int fd, const char *devname, int force, int is_blkdev)
 		if (lseek(fd, 0, SEEK_SET) != 0)
 			errx(EXIT_FAILURE, _("unable to rewind swap-device"));
 
-		if (is_blkdev && is_whole_disk_fd(fd, devname)) {
+		if (is_blkdevice && is_whole_disk_fd(fd, devname)) {
 			/* don't zap bootbits on whole disk -- we know nothing
 			 * about bootloaders on the device */
 			whole = 1;
-- 
1.7.11.3

[PATCH 02/19] libmount: fix shadow declaration

[Sami Kerola]

libmount/src/tab_update.c:203:8: warning: declaration of 'rc' shadows a previous local [-Wshadow]
libmount/src/tab_update.c:159:6: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 libmount/src/tab_update.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmount/src/tab_update.c b/libmount/src/tab_update.c
index 56e87cf..caabd05 100644
--- a/libmount/src/tab_update.c
+++ b/libmount/src/tab_update.c
@@ -200,7 +200,7 @@ int mnt_update_set_fs(struct libmnt_update *upd, unsigned long mountflags,
 
 	} else if (fs) {
 		if (upd->userspace_only && !(mountflags & MS_MOVE)) {
-			int rc = utab_new_entry(upd, fs, mountflags);
+			rc = utab_new_entry(upd, fs, mountflags);
 			if (rc)
 				return rc;
 		} else {
-- 
1.7.11.3

[PATCH 03/19] sulogin: fix shadow declaration

[Sami Kerola]

login-utils/sulogin.c:337:8: warning: declaration of 'sushell' shadows a global declaration [-Wshadow]
login-utils/sulogin.c:332:13: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 login-utils/sulogin.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index 7ac493b..d7d44b6 100644
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -334,7 +334,7 @@ static void sushell(struct passwd *pwd)
 	char shell[PATH_MAX];
 	char home[PATH_MAX];
 	char *p;
-	char *sushell;
+	char *su_shell;
 
 	/*
 	 * Set directory and shell.
@@ -348,17 +348,17 @@ static void sushell(struct passwd *pwd)
 	}
 
 	if ((p = getenv("SUSHELL")) != NULL)
-		sushell = p;
+		su_shell = p;
 	else if ((p = getenv("sushell")) != NULL)
-		sushell = p;
+		su_shell = p;
 	else {
 		if (pwd->pw_shell[0])
-			sushell = pwd->pw_shell;
+			su_shell = pwd->pw_shell;
 		else
-			sushell = "/bin/sh";
+			su_shell = "/bin/sh";
 	}
-	if ((p = strrchr(sushell, '/')) == NULL)
-		p = sushell;
+	if ((p = strrchr(su_shell, '/')) == NULL)
+		p = su_shell;
 	else
 		p++;
 
@@ -378,7 +378,7 @@ static void sushell(struct passwd *pwd)
 	/*
 	 * Try to execute a shell.
 	 */
-	setenv("SHELL", sushell, 1);
+	setenv("SHELL", su_shell, 1);
 	unmask_signal(SIGINT, &saved_sigint);
 	unmask_signal(SIGTSTP, &saved_sigtstp);
 	unmask_signal(SIGQUIT, &saved_sigquit);
@@ -399,8 +399,8 @@ static void sushell(struct passwd *pwd)
 		free(level);
 	}
 #endif
-	execl(sushell, shell, NULL);
-	warn(_("%s: exec failed"), sushell);
+	execl(su_shell, shell, NULL);
+	warn(_("%s: exec failed"), su_shell);
 
 	setenv("SHELL", "/bin/sh", 1);
 	execl("/bin/sh", profile ? "-sh" : "sh", NULL);
-- 
1.7.11.3

[PATCH 04/19] blkid: fix shadow declaration

[Sami Kerola]

misc-utils/blkid.c:402:15: warning: declaration of 'usage' shadows a global declaration [-Wshadow]
misc-utils/blkid.c:63:13: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 misc-utils/blkid.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 579ad27..920f639 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -399,17 +399,17 @@ static int print_udev_ambivalent(blkid_probe pr)
 	int count = 0, rc = -1;
 
 	while (!blkid_do_probe(pr)) {
-		const char *usage = NULL, *type = NULL, *version = NULL;
+		const char *usage_txt = NULL, *type = NULL, *version = NULL;
 		char enc[256];
 
-		blkid_probe_lookup_value(pr, "USAGE", &usage, NULL);
+		blkid_probe_lookup_value(pr, "USAGE", &usage_txt, NULL);
 		blkid_probe_lookup_value(pr, "TYPE", &type, NULL);
 		blkid_probe_lookup_value(pr, "VERSION", &version, NULL);
 
-		if (!usage || !type)
+		if (!usage_txt || !type)
 			continue;
 
-		blkid_encode_string(usage, enc, sizeof(enc));
+		blkid_encode_string(usage_txt, enc, sizeof(enc));
 		if (append_str(&val, &valsz, enc, ":"))
 			goto done;
 
-- 
1.7.11.3

[PATCH 05/19] lslocks: fix shadow declaration

[Sami Kerola]

misc-utils/lslocks.c:157:49: warning: declaration of 'pid' shadows a global declaration [-Wshadow]
misc-utils/lslocks.c:80:14: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 misc-utils/lslocks.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index 094224d..56855f4 100644
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -104,12 +104,12 @@ static void disable_columns_truncate(void)
 /*
  * Return a PID's command name
  */
-static char *get_cmdname(pid_t pid)
+static char *get_cmdname(pid_t qpid)
 {
 	FILE *fp;
 	char path[PATH_MAX], *ret = NULL;
 
-	sprintf(path, "/proc/%d/comm", pid);
+	sprintf(path, "/proc/%d/comm", qpid);
 	if (!(fp = fopen(path, "r")))
 		return NULL;
 
-- 
1.7.11.3

[PATCH 06/19] whereis: fix shadow declaration

[Sami Kerola]

misc-utils/whereis.c:191:7: warning: declaration of 'dirp' shadows a global declaration [-Wshadow]
misc-utils/whereis.c:134:42: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 misc-utils/whereis.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index 6807b8a..6faf262 100644
--- a/misc-utils/whereis.c
+++ b/misc-utils/whereis.c
@@ -188,7 +188,7 @@ itsit(char *cp, char *dp)
 static void
 findin(char *dir, char *cp)
 {
-	DIR *dirp;
+	DIR *derp;
 	struct dirent *dp;
 	char *d, *dd;
 	size_t l;
@@ -197,17 +197,17 @@ findin(char *dir, char *cp)
 
 	dd = strchr(dir, '*');
 	if (!dd) {
-		dirp = opendir(dir);
-		if (dirp == NULL)
+		derp = opendir(dir);
+		if (derp == NULL)
 			return;
-		while ((dp = readdir(dirp)) != NULL) {
+		while ((dp = readdir(derp)) != NULL) {
 			if (itsit(cp, dp->d_name)) {
 				count++;
 				if (print)
 					printf(" %s/%s", dir, dp->d_name);
 			}
 		}
-		closedir(dirp);
+		closedir(derp);
 		return;
 	}
 
@@ -217,10 +217,10 @@ findin(char *dir, char *cp)
 		strcpy(dirbuf, dir);
 		d = strchr(dirbuf, '*');
 		*d = 0;
-		dirp = opendir(dirbuf);
-		if (dirp == NULL)
+		derp = opendir(dirbuf);
+		if (derp == NULL)
 			return;
-		while ((dp = readdir(dirp)) != NULL) {
+		while ((dp = readdir(derp)) != NULL) {
 			if (!strcmp(dp->d_name, ".") ||
 			    !strcmp(dp->d_name, ".."))
 				continue;
@@ -234,7 +234,7 @@ findin(char *dir, char *cp)
 			strcat(d, dd + 1);
 			findin(dirbuf, cp);
 		}
-		closedir(dirp);
+		closedir(derp);
 	}
 	return;
 
-- 
1.7.11.3

[PATCH 07/19] eject: fix shadow declaration

[Sami Kerola]

sys-utils/eject.c:529:11: warning: declaration of 'str' shadows a previous local [-Wshadow]
sys-utils/eject.c:506:9: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 sys-utils/eject.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-utils/eject.c b/sys-utils/eject.c
index c8bb6a8..08af08e 100644
--- a/sys-utils/eject.c
+++ b/sys-utils/eject.c
@@ -526,7 +526,6 @@ static int read_speed(const char *devname)
 		} else {
 			if (strncmp(line, "drive speed:", 12) == 0) {
 				int i;
-				char *str;
 
 				str = strtok(&line[12], "\t ");
 				for (i = 1; i < drive_number; i++)
-- 
1.7.11.3

[PATCH 08/19] lscpu: fix shadow declaration

[Sami Kerola]

sys-utils/lscpu.c:1084:8: warning: declaration of 'buf' shadows a previous local [-Wshadow]
sys-utils/lscpu.c:1077:7: warning: shadowed declaration is here [-Wshadow]
sys-utils/lscpu.c:1144:9: warning: declaration of 'buf' shadows a previous local [-Wshadow]
sys-utils/lscpu.c:1077:7: warning: shadowed declaration is here [-Wshadow]
sys-utils/lscpu.c:1196:8: warning: declaration of 'buf' shadows a previous local [-Wshadow]
sys-utils/lscpu.c:1077:7: warning: shadowed declaration is here [-Wshadow]
sys-utils/lscpu.c:1197:7: warning: declaration of 'i' shadows a previous local [-Wshadow]
sys-utils/lscpu.c:1078:6: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 sys-utils/lscpu.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 3984b2d..7a712de 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1081,7 +1081,7 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
 	print_s(_("Architecture:"), desc->arch);
 
 	if (desc->mode) {
-		char buf[64], *p = buf;
+		char mbuf[64], *p = mbuf;
 
 		if (desc->mode & MODE_32BIT) {
 			strcpy(p, "32-bit, ");
@@ -1092,7 +1092,7 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
 			p += 8;
 		}
 		*(p - 2) = '\0';
-		print_s(_("CPU op-mode(s):"), buf);
+		print_s(_("CPU op-mode(s):"), mbuf);
 	}
 #if !defined(WORDS_BIGENDIAN)
 	print_s(_("Byte Order:"), "Little Endian");
@@ -1141,11 +1141,11 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
 		 */
 		if (path_exist(_PATH_PROC_SYSINFO)) {
 			FILE *fd = path_fopen("r", 0, _PATH_PROC_SYSINFO);
-			char buf[BUFSIZ];
+			char pbuf[BUFSIZ];
 			int t0, t1, t2;
 
-			while (fd && fgets(buf, sizeof(buf), fd) != NULL) {
-				if (sscanf(buf, "CPU Topology SW:%d%d%d%d%d%d",
+			while (fd && fgets(pbuf, sizeof(pbuf), fd) != NULL) {
+				if (sscanf(pbuf, "CPU Topology SW:%d%d%d%d%d%d",
 					   &t0, &t1, &t2, &books, &sockets_per_book,
 					   &cores_per_socket) == 6)
 					break;
@@ -1193,13 +1193,12 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
 	if (desc->dispatching >= 0)
 		print_s(_("Dispatching mode:"), _(disp_modes[desc->dispatching]));
 	if (desc->ncaches) {
-		char buf[512];
-		int i;
+		char cbuf[512];
 
 		for (i = desc->ncaches - 1; i >= 0; i--) {
-			snprintf(buf, sizeof(buf),
+			snprintf(cbuf, sizeof(cbuf),
 					_("%s cache:"), desc->caches[i].name);
-			print_s(buf, desc->caches[i].size);
+			print_s(cbuf, desc->caches[i].size);
 		}
 	}
 
-- 
1.7.11.3

[PATCH 09/19] setterm: fix shadow declaration

[Sami Kerola]

term-utils/setterm.c:221:55: warning: declaration of 'opt_term' shadows a global declaration [-Wshadow]
term-utils/setterm.c:181:5: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 term-utils/setterm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 3083ac8..03148f7 100644
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -218,11 +218,11 @@ static void screendump(int vcnum, FILE *F);
  */
 
 static void
-parse_term(int argc, char **argv, int *option, char **opt_term, int *bad_arg) {
+parse_term(int argc, char **argv, int *option, char **opt_trm, int *bad_arg) {
 	/* argc: Number of arguments for this option. */
 	/* argv: Arguments for this option. */
 	/* option: Term flag to set. */
-	/* opt_term: Terminal name to set. */
+	/* opt_trm: Terminal name to set. */
 	/* bad_arg: Set to true if an error is detected. */
 
 /* Parse a -term specification. */
@@ -231,7 +231,7 @@ parse_term(int argc, char **argv, int *option, char **opt_term, int *bad_arg) {
 		*bad_arg = TRUE;
 	*option = TRUE;
 	if (argc == 1)
-		*opt_term = argv[0];
+		*opt_trm = argv[0];
 }
 
 static void
-- 
1.7.11.3

[PATCH 10/19] more: fix shadow declaration

[Sami Kerola]

text-utils/more.c:1123:13: warning: declaration of 'state' shadows a previous local [-Wshadow]
text-utils/more.c:1095:18: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 text-utils/more.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/text-utils/more.c b/text-utils/more.c
index 4cf090f..5e41a54 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -1120,10 +1120,10 @@ void prbuf (register char *s, register int n)
 	    {
 		wchar_t wc;
 		size_t mblength;
-		mbstate_t state;
-		memset (&state, '\0', sizeof (mbstate_t));
+		mbstate_t mbstate;
+		memset (&mbstate, '\0', sizeof (mbstate_t));
 		s--; n++;
-		mblength = mbrtowc (&wc, s, n, &state);
+		mblength = mbrtowc (&wc, s, n, &mbstate);
 		if (mblength == (size_t) -2 || mblength == (size_t) -1)
 			mblength = 1;
 		while (mblength--)
-- 
1.7.11.3

[PATCH 11/19] ul: fix shadow declaration

[Sami Kerola]

text-utils/ul.c:641:25: warning: declaration of 'col' shadows a global declaration [-Wshadow]
text-utils/ul.c:126:5: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 text-utils/ul.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/text-utils/ul.c b/text-utils/ul.c
index 80bc7a1..3c7bf50 100644
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -638,11 +638,11 @@ static void setcol(int newcol) {
 		needcol(col);
 }
 
-static void needcol(int col) {
-	maxcol = col;
+static void needcol(int acol) {
+	maxcol = acol;
 
 	/* If col >= obuflen, expand obuf until obuflen > col. */
-	while (col >= obuflen) {
+	while (acol >= obuflen) {
 		/* Paranoid check for obuflen == INT_MAX. */
 		if (obuflen == INT_MAX)
 			errx(EXIT_FAILURE, _("Input line too long."));
-- 
1.7.11.3

[PATCH 12/19] hexdump: fix shadow declaration

[Sami Kerola]

text-utils/hexdump.h:84:5: warning: shadowed declaration is here [-Wshadow]
./include/xalloc.h:23:28: warning: declaration of 'size' shadows a global declaration [-Wshadow]
./include/xalloc.h:33:40: warning: declaration of 'size' shadows a global declaration [-Wshadow]
./include/xalloc.h:43:49: warning: declaration of 'size' shadows a global declaration [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 text-utils/hexdump.c | 2 +-
 text-utils/hexdump.h | 2 +-
 text-utils/parse.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
index 90c2d77..a4a61cf 100644
--- a/text-utils/hexdump.c
+++ b/text-utils/hexdump.c
@@ -68,7 +68,7 @@ int main(int argc, char **argv)
 
 	/* figure out the data block size */
 	for (blocksize = 0, tfs = fshead; tfs; tfs = tfs->nextfs) {
-		tfs->bcnt = size(tfs);
+		tfs->bcnt = block_size(tfs);
 		if (blocksize < tfs->bcnt)
 			blocksize = tfs->bcnt;
 	}
diff --git a/text-utils/hexdump.h b/text-utils/hexdump.h
index 2222585..b9e67a1 100644
--- a/text-utils/hexdump.h
+++ b/text-utils/hexdump.h
@@ -81,7 +81,7 @@ extern off_t skip;                      /* bytes to skip */
 enum _vflag { ALL, DUP, FIRST, WAIT };	/* -v values */
 extern enum _vflag vflag;
 
-int size(FS *);
+int block_size(FS *);
 void add(const char *);
 void rewrite(FS *);
 void addfile(char *);
diff --git a/text-utils/parse.c b/text-utils/parse.c
index 481db6d..5f1e2bd 100644
--- a/text-utils/parse.c
+++ b/text-utils/parse.c
@@ -150,7 +150,7 @@ void add(const char *fmt)
 
 static const char *spec = ".#-+ 0123456789";
 
-int size(FS *fs)
+int block_size(FS *fs)
 {
 	FU *fu;
 	int bcnt, cursize;
-- 
1.7.11.3

[PATCH 13/19] include: define format to be constant in xasprintf()

[Sami Kerola]

Add also format function attribute to add robustness.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 include/xalloc.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/xalloc.h b/include/xalloc.h
index 8c22ff7..1704259 100644
--- a/include/xalloc.h
+++ b/include/xalloc.h
@@ -63,7 +63,8 @@ static inline char *xstrdup(const char *str)
         return ret;
 }
 
-static inline int xasprintf(char **strp, char *fmt, ...)
+static inline int __attribute__ ((__format__(printf, 2, 3)))
+    xasprintf(char **strp, const char *fmt, ...)
 {
 	int ret;
 	va_list args;
-- 
1.7.11.3

[PATCH 14/19] fdisk: add noreturn function attribute

[Sami Kerola]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 fdisks/fdisk.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index 32b6de9..7fca5b6 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -159,7 +159,8 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
 	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
-void fatal(struct fdisk_context *cxt, enum failure why)
+void __attribute__((__noreturn__))
+fatal(struct fdisk_context *cxt, enum failure why)
 {
 	close(cxt->dev_fd);
 	switch (why) {
-- 
1.7.11.3

[PATCH 15/19] libblkid: add noreturn function attribute

[Sami Kerola]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 libblkid/src/dev.c | 2 +-
 libblkid/src/tag.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libblkid/src/dev.c b/libblkid/src/dev.c
index 791a6c1..58ee6f8 100644
--- a/libblkid/src/dev.c
+++ b/libblkid/src/dev.c
@@ -206,7 +206,7 @@ extern char *optarg;
 extern int optind;
 #endif
 
-void usage(char *prog)
+void __attribute__((__noreturn__)) usage(char *prog)
 {
 	fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask]\n", prog);
 	fprintf(stderr, "\tList all devices and exit\n");
diff --git a/libblkid/src/tag.c b/libblkid/src/tag.c
index 0dbe1ff..be4ef35 100644
--- a/libblkid/src/tag.c
+++ b/libblkid/src/tag.c
@@ -390,7 +390,7 @@ extern char *optarg;
 extern int optind;
 #endif
 
-void usage(char *prog)
+void __attribute__((__noreturn__)) usage(char *prog)
 {
 	fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask] device "
 		"[type value]\n",
-- 
1.7.11.3

[PATCH 16/19] libmount: add noreturn function attribute

[Sami Kerola]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 libmount/src/lock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmount/src/lock.c b/libmount/src/lock.c
index 80ccdee..9f04725 100644
--- a/libmount/src/lock.c
+++ b/libmount/src/lock.c
@@ -589,7 +589,7 @@ void clean_lock(void)
 	mnt_free_lock(lock);
 }
 
-void sig_handler(int sig)
+void __attribute__((__noreturn__)) sig_handler(int sig)
 {
 	errx(EXIT_FAILURE, "\n%d: catch signal: %s\n", getpid(), strsignal(sig));
 }
-- 
1.7.11.3

[PATCH 17/19] vipw: add noreturn function attribute

[Sami Kerola]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 login-utils/vipw.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/login-utils/vipw.c b/login-utils/vipw.c
index 3377112..ed3f43b 100644
--- a/login-utils/vipw.c
+++ b/login-utils/vipw.c
@@ -236,7 +236,8 @@ static void pw_edit(int notsetuid)
 	free(editor);
 }
 
-void pw_error(char *name, int err, int eval)
+void __attribute__((__noreturn__))
+pw_error(char *name, int err, int eval)
 {
 	if (err) {
 		if (name)
-- 
1.7.11.3

[PATCH 18/19] script: add noreturn function attributes

[Sami Kerola]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 term-utils/script.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/term-utils/script.c b/term-utils/script.c
index 8d7ab65..ccd8873 100644
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -289,7 +289,7 @@ main(int argc, char **argv) {
 	return EXIT_SUCCESS;
 }
 
-void
+void __attribute__((__noreturn__))
 doinput(void) {
 	ssize_t cc;
 	char ibuf[BUFSIZ];
@@ -345,7 +345,7 @@ my_strftime(char *buf, size_t len, const char *fmt, const struct tm *tm) {
 	strftime(buf, len, fmt, tm);
 }
 
-void
+void __attribute__((__noreturn__))
 dooutput(FILE *timingfd) {
 	ssize_t cc;
 	time_t tvec;
@@ -412,7 +412,7 @@ dooutput(FILE *timingfd) {
 	done();
 }
 
-void
+void __attribute__((__noreturn__))
 doshell(void) {
 	char *shname;
 
@@ -462,14 +462,14 @@ fixtty(void) {
 	tcsetattr(STDIN_FILENO, TCSANOW, &rtt);
 }
 
-void
+void __attribute__((__noreturn__))
 fail(void) {
 
 	kill(0, SIGTERM);
 	done();
 }
 
-void
+void __attribute__((__noreturn__))
 done(void) {
 	time_t tvec;
 
-- 
1.7.11.3

[PATCH 19/19] more: add noreturn function attribute

[Sami Kerola]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 text-utils/more.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/text-utils/more.c b/text-utils/more.c
index 5e41a54..58c99cc 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -755,7 +755,8 @@ void chgwinsz(int dummy __attribute__ ((__unused__)))
 ** Clean up terminal state and exit. Also come here if interrupt signal received
 */
 
-void end_it (int dummy __attribute__ ((__unused__)))
+void __attribute__((__noreturn__))
+end_it (int dummy __attribute__ ((__unused__)))
 {
     reset_tty ();
     if (clreol) {
-- 
1.7.11.3

[PATCH 1/5] ddate: russian manual missing from package

[Sami Kerola]

This manpage causes more trouble than its worth.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 Makefile.am              | 2 +-
 misc-utils/Makemodule.am | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 63ff205..112a4fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ UNINSTALL_HOOKS =
 INSTALL_DATA_HOOKS =
 CLEAN_LOCALS =
 
-EXTRA_DIST =
+EXTRA_DIST = man/ru/ddate.1
 CLEANFILES =
 
 SUBDIRS = po
diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 75b2e90..e2faea6 100644
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -57,7 +57,6 @@ usrbin_exec_PROGRAMS += ddate
 dist_man_MANS += misc-utils/ddate.1
 ddate_SOURCES = misc-utils/ddate.c
 ruman1_DATA += man/ru/ddate.1
-EXTRA_DIST += $(ruman1_DATA)
 endif
 
 if BUILD_LSLOCKS
-- 
1.7.11.3

[PATCH 2/5] docs: clean up sulogin.8 manual

[Sami Kerola]

Align with Documentation/howto-man-page.txt

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 login-utils/sulogin.8 | 70 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 26 deletions(-)

diff --git a/login-utils/sulogin.8 b/login-utils/sulogin.8
index 24c120d..b9dec16 100644
--- a/login-utils/sulogin.8
+++ b/login-utils/sulogin.8
@@ -16,7 +16,7 @@
 .\" along with this program; if not, write to the Free Software
 .\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 .\"
-.TH SULOGIN 8 "Mar 2012" "" "Linux System Administrator's Manual"
+.TH SULOGIN "8" "Jul 2012" "util-linux" "System Administration"
 .SH NAME
 sulogin \- Single-user login
 .SH SYNOPSIS
@@ -25,7 +25,9 @@ sulogin \- Single-user login
 .RB [ tty ]
 .SH DESCRIPTION
 .I sulogin
-is invoked by \fBinit\fP when the system goes into single user mode.
+is invoked by
+.B init
+when the system goes into single user mode.
 .PP
 The user is prompted:
 .IP "" .5i
@@ -33,40 +35,56 @@ Give root password for system maintenance
 .br
 (or type Control\-D for normal startup):
 .PP
-\fIsulogin\fP will be connected to the current terminal, or to the
-optional tty device that can be specified on the command line
-(typically \fB/dev/console\fP).
+.I sulogin
+will be connected to the current terminal, or to the optional tty device that
+can be specified on the command line (typically
+.BR /dev/console ).
 .PP
 After the user exits the single-user shell or presses control\-D at the
 prompt, the system will continue to boot.
 .SH OPTIONS
-.IP "\fB\-e, \-\-force\fP"
-If the default method of obtaining the root password via \fBgetpwnam\fP(3) from
-the system fails, manually examine /etc/passwd and /etc/shadow to get the
-password. If they are damaged or nonexistent, sulogin will start a root shell
-without asking for a password.
-
-Only use the \fB\-e\fP option if you are sure the console is physically
-protected against unauthorized access.
-.IP "\fB\-h, \-\-help\fP"
-Print a help message.
-.IP "\fB\-p, \-\-login\-shell\fP"
-Specifying this option causes sulogin to start the shell process as a
-login shell.
-.IP "\fB\-t, \-\-timeout \fIseconds\fP"
-Specify the maximum amount of time to wait for user input. By default,
+.IP "\fB\-e\fR, \fB\-\-force\fP"
+If the default method of obtaining the root password via
+.BR getpwnam (3)
+from the system fails, manually examine
+.I /etc/passwd
+and
+.I /etc/shadow
+to get the password.  If they are damaged or nonexistent, sulogin will start
+a root shell without asking for a password.
+.IP
+Only use the
+.B \-e
+option if you are sure the console is physically protected against
+unauthorized access.
+.IP "\fB\-p\fR, \fB\-\-login\-shell\fP"
+Specifying this option causes sulogin to start the shell process as a login
+shell.
+.IP "\fB\-t\fR, \fB\-\-timeout \fIseconds\fP"
+Specify the maximum amount of time to wait for user input.  By default,
 sulogin will wait forever.
-.IP "\fB\-V, \-\-version\fP"
+.IP "\fB\-h\fR, \fB\-\-help\fP"
+Print a help message.
+.IP "\fB\-V\fR, \fB\-\-version\fP"
 Output version.
 .SH ENVIRONMENT VARIABLES
-\fIsulogin\fP looks for the environment variable \fBSUSHELL\fP or
-\fBsushell\fP to determine what shell to start. If the environment variable
-is not set, it will try to execute root's shell from /etc/passwd. If that
-fails it will fall back to \fB/bin/sh\fP.
+.I sulogin
+looks for the environment variable
+.B SUSHELL
+or
+.B sushell
+to determine what shell to start.  If the environment variable is not set, it
+will try to execute root's shell from
+.IR /etc/passwd .
+If that fails it
+will fall back to
+.IR /bin/sh .
 .SH AUTHOR
 .B sulogin
 was written by Miquel van Smoorenburg for sysvinit and later ported
 to util-linux by Dave Reisner and Karel Zak.
 .SH AVAILABILITY
 The sulogin command is part of the util-linux package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
+.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
+Linux Kernel Archive
+.UE .
-- 
1.7.11.3

[PATCH 3/5] wdctl: fix conflicting types on old systems

[Sami Kerola]

The program wants the userland version of declaration(s), not the
kernel one.  Problem occured with glibc-devel-2.5-34.

/usr/include/stdint.h:41: error: conflicting types for 'int64_t'
/usr/include/linux/types.h:98: error: previous declaration of 'int64_t' was here
/usr/include/stdint.h:56: error: conflicting types for 'uint64_t'
/usr/include/linux/types.h:96: error: previous declaration of 'uint64_t' was here
In file included from /usr/include/stdlib.h:438,
                 from ./include/c.h:13,
                 from sys-utils/wdctl.c:30:

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 sys-utils/wdctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c
index ebe55b4..d5ca50c 100644
--- a/sys-utils/wdctl.c
+++ b/sys-utils/wdctl.c
@@ -18,13 +18,13 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include <linux/watchdog.h>
 #include <sys/ioctl.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <signal.h>
 #include <assert.h>
+#include <linux/watchdog.h>
 
 #include "nls.h"
 #include "c.h"
-- 
1.7.11.3

[PATCH 4/5] dmesg: inform user when klogctl() or read_buffer() fails

[Sami Kerola]

Fix to small regression which made 'dmesg --clear' not to error
when running without root privileges.  Same happen with '-D' and
few other options as well.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 sys-utils/dmesg.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index 1819c7c..15b9fae 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -985,7 +985,7 @@ static int read_kmsg(struct dmesg_control *ctl)
 int main(int argc, char *argv[])
 {
 	char *buf = NULL;
-	ssize_t  n;
+	ssize_t  n, r;
 	int  c;
 	int  console_level = 0;
 	static struct dmesg_control ctl = {
@@ -1138,6 +1138,7 @@ int main(int argc, char *argv[])
 	argc -= optind;
 	argv += optind;
 	n = 0;
+	r = 0;
 
 	if (argc > 1)
 		usage(stderr);
@@ -1158,9 +1159,9 @@ int main(int argc, char *argv[])
 		if (ctl.method == DMESG_METHOD_KMSG && init_kmsg(&ctl) != 0)
 			ctl.method = DMESG_METHOD_SYSLOG;
 
-		n = read_buffer(&ctl, &buf);
-		if (n > 0)
-			print_buffer(&ctl, buf, n);
+		r = read_buffer(&ctl, &buf);
+		if (r > 0)
+			print_buffer(&ctl, buf, r);
 		if (!ctl.mmap_buff)
 			free(buf);
 		break;
@@ -1180,8 +1181,10 @@ int main(int argc, char *argv[])
 	if (ctl.kmsg >= 0)
 		close(ctl.kmsg);
 
-	if (n < 0 && ctl.method == DMESG_METHOD_SYSLOG)
+	if (n < 0)
 		err(EXIT_FAILURE, _("klogctl failed"));
+	if (r < 0)
+		err(EXIT_FAILURE, _("read_buffer failed"));
 
 	return EXIT_SUCCESS;
 }
-- 
1.7.11.3

[PATCH 5/5] docs: tell about irc channel

[Sami Kerola]

Reference: http://comments.gmane.org/gmane.linux.utilities.util-linux-ng/3550
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 Documentation/howto-contribute.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Documentation/howto-contribute.txt b/Documentation/howto-contribute.txt
index 098f456..5df6389 100644
--- a/Documentation/howto-contribute.txt
+++ b/Documentation/howto-contribute.txt
@@ -116,3 +116,13 @@ Various notes
 	* When you use if shortshort hand make sure it is not wrapped to
 	  multiple lines. In case the shorthand does not look good on one
 	  line use normal "if () else" syntax.
+
+IRC channel
+
+	* We have a new #util-linux IRC channel at freenode.net.
+
+	  irc://chat.freenode.net/util-linux
+
+	  the channel is for developers or upstream maintainers.  User
+	  support is recommended to go to distribution channels or
+	  forums.
-- 
1.7.11.3

Re: [PATCH 0/27] preparation to release some time soon

[Karel Zak]

On Wed, Jul 25, 2012 at 09:15:18PM +0200, Sami Kerola wrote:
> I think in future I will send the pull requests format 'git send-email 
> --compose' cover letter.  Without doubt doing this is noisier than  
> sending only pull request, but hopefully makes review more transparent.
> Lets try for few times, and if this works the method should probably be
> documented in Documentation/howto-contribute.txt as preferred way to
> send pull request.  What do you think, does this make sense, help
> review, etc, comments?

 For me it's more usable to have patches in mailing list, because
 it's more easy to control which patches I'll apply by git-am.

 The git-pull is excellent if you merge something complete without
 extra changes, otherwise you need to pull to non-master branch and
 cherry-pick only wanted patches.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 1/3] tests: partx changed default output format

[Karel Zak]

On Wed, Jul 25, 2012 at 09:15:19PM +0200, Sami Kerola wrote:
>  tests/expected/partx/partx-bsd     |  5 +++--
>  tests/expected/partx/partx-dos+bsd |  9 +++++----
>  tests/expected/partx/partx-gpt     | 11 ++++++-----
>  tests/expected/partx/partx-sgi     |  5 +++--
>  tests/expected/partx/partx-sun     |  5 +++--

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 2/3] tests: look: add words file

[Karel Zak]

On Wed, Jul 25, 2012 at 09:15:20PM +0200, Sami Kerola wrote:
> Archlinux words 2.0-4 package does not have 'apple-pie' in words file.

 ... because there is no 'words' upstream :-(

>  tests/ts/look/separator | 4 +---
>  tests/ts/look/words     | 3 +++
>  2 files changed, 4 insertions(+), 3 deletions(-)
>  create mode 100644 tests/ts/look/words

Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 3/3] tests: fdisk: change expected test output

[Karel Zak]

On Wed, Jul 25, 2012 at 09:15:21PM +0200, Sami Kerola wrote:
> Align with commit 289dcc90234680063a336925a99d1ef04e97cbda.  The check
> will work for now.  Notice that the fdisk check will probably get more
> changes in near future, see reference for more information.
> 
> Reference: http://marc.info/?l=util-linux-ng&m=134251966722938&w=2
> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
> ---
>  tests/expected/fdisk/oddinput | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

not applied, already fixed in the repository

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 01/19] mkswap: fix shadow declaration

[Karel Zak]

On Wed, Jul 25, 2012 at 09:15:22PM +0200, Sami Kerola wrote:
> disk-utils/mkswap.c:366:57: warning: declaration of 'is_blkdev' shadows a global declaration [-Wshadow]
> ./include/blkdev.h:92:5: warning: shadowed declaration is here [-Wshadow]
> 
> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
> ---
>  disk-utils/mkswap.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 02/19] libmount: fix shadow declaration

[Karel Zak]

On Wed, Jul 25, 2012 at 09:15:23PM +0200, Sami Kerola wrote:
> libmount/src/tab_update.c:203:8: warning: declaration of 'rc' shadows a previous local [-Wshadow]
> libmount/src/tab_update.c:159:6: warning: shadowed declaration is here [-Wshadow]
> 
> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
> ---
>  libmount/src/tab_update.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 03/19] sulogin: fix shadow declaration

[Karel Zak]

On Wed, Jul 25, 2012 at 09:15:24PM +0200, Sami Kerola wrote:
> login-utils/sulogin.c:337:8: warning: declaration of 'sushell' shadows a global declaration [-Wshadow]
> login-utils/sulogin.c:332:13: warning: shadowed declaration is here [-Wshadow]
> 
> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
> ---
>  login-utils/sulogin.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)

 Applied, thanks.


-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 04/19] blkid: fix shadow declaration

[Karel Zak]

On Wed, Jul 25, 2012 at 09:15:25PM +0200, Sami Kerola wrote:
> misc-utils/blkid.c:402:15: warning: declaration of 'usage' shadows a global declaration [-Wshadow]
> misc-utils/blkid.c:63:13: warning: shadowed declaration is here [-Wshadow]
> 
> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
> ---
>  misc-utils/blkid.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 0/27] preparation to release some time soon

[Karel Zak]

On Wed, Jul 25, 2012 at 09:15:18PM +0200, Sami Kerola wrote:
> Everything else is in 'would be nice to have' category.

All applied (some with small changes). Thanks.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com