[PATCH 1/4] include: rename writeall.h to all-io.h

[PATCH 1/4] include: rename writeall.h to all-io.h

[Petr Uzel]

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---
 disk-utils/fsck.minix.c |    2 +-
 disk-utils/mkfs.minix.c |    2 +-
 disk-utils/mkswap.c     |    2 +-
 disk-utils/swaplabel.c  |    2 +-
 include/Makefile.am     |    2 +-
 include/all-io.h        |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 include/writeall.h      |   47 -----------------------------------------------
 lib/path.c              |    2 +-
 libblkid/src/probe.c    |    2 +-
 login-utils/login.c     |    2 +-
 misc-utils/uuidd.c      |    2 +-
 misc-utils/wipefs.c     |    2 +-
 sys-utils/dmesg.c       |    2 +-
 term-utils/agetty.c     |    2 +-
 text-utils/pg.c         |    2 +-
 15 files changed, 60 insertions(+), 60 deletions(-)
 create mode 100644 include/all-io.h
 delete mode 100644 include/writeall.h

diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 139ab7a..5e56e83 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -109,7 +109,7 @@
 #include "pathnames.h"
 #include "bitops.h"
 #include "ismounted.h"
-#include "writeall.h"
+#include "all-io.h"
 #include "closestream.h"
 
 #define ROOT_INO 1
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 051cd5f..c5baac1 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -84,7 +84,7 @@
 #include "bitops.h"
 #include "exitcodes.h"
 #include "strutils.h"
-#include "writeall.h"
+#include "all-io.h"
 #include "closestream.h"
 
 #define MINIX_ROOT_INO 1
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 51a0c89..b3bc586 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -54,7 +54,7 @@
 #include "blkdev.h"
 #include "pathnames.h"
 #include "wholedisk.h"
-#include "writeall.h"
+#include "all-io.h"
 #include "xalloc.h"
 #include "c.h"
 #include "closestream.h"
diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c
index 716db9e..bf4ee71 100644
--- a/disk-utils/swaplabel.c
+++ b/disk-utils/swaplabel.c
@@ -27,7 +27,7 @@
 
 #include "c.h"
 #include "closestream.h"
-#include "writeall.h"
+#include "all-io.h"
 #include "swapheader.h"
 #include "strutils.h"
 #include "nls.h"
diff --git a/include/Makefile.am b/include/Makefile.am
index f61cb04..82164e4 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,6 +1,7 @@
 include $(top_srcdir)/config/include-Makefile.am
 
 dist_noinst_HEADERS = \
+	all-io.h \
 	at.h \
 	bitops.h \
 	blkdev.h \
@@ -40,6 +41,5 @@ dist_noinst_HEADERS = \
 	usleep.h \
 	wholedisk.h \
 	widechar.h \
-	writeall.h \
 	xalloc.h \
 	xgetpass.h
diff --git a/include/all-io.h b/include/all-io.h
new file mode 100644
index 0000000..4d1ae1e
--- /dev/null
+++ b/include/all-io.h
@@ -0,0 +1,47 @@
+#ifndef UTIL_LINUX_ALL_IO_H
+#define UTIL_LINUX_ALL_IO_H
+
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+static inline int write_all(int fd, const void *buf, size_t count)
+{
+	while (count) {
+		ssize_t tmp;
+
+		errno = 0;
+		tmp = write(fd, buf, count);
+		if (tmp > 0) {
+			count -= tmp;
+			if (count)
+				buf += tmp;
+		} else if (errno != EINTR && errno != EAGAIN)
+			return -1;
+		if (errno == EAGAIN)	/* Try later, *sigh* */
+			usleep(10000);
+	}
+	return 0;
+}
+
+static inline int fwrite_all(const void *ptr, size_t size,
+			     size_t nmemb, FILE *stream)
+{
+	while (nmemb) {
+		size_t tmp;
+
+		errno = 0;
+		tmp = fwrite(ptr, size, nmemb, stream);
+		if (tmp > 0) {
+			nmemb -= tmp;
+			if (nmemb)
+				ptr += (tmp * size);
+		} else if (errno != EINTR && errno != EAGAIN)
+			return -1;
+		if (errno == EAGAIN)	/* Try later, *sigh* */
+			usleep(10000);
+	}
+	return 0;
+}
+
+#endif /* UTIL_LINUX_ALL_IO_H */
diff --git a/include/writeall.h b/include/writeall.h
deleted file mode 100644
index 6aa4927..0000000
--- a/include/writeall.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef UTIL_LINUX_WRITEALL_H
-#define UTIL_LINUX_WRITEALL_H
-
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-static inline int write_all(int fd, const void *buf, size_t count)
-{
-	while (count) {
-		ssize_t tmp;
-
-		errno = 0;
-		tmp = write(fd, buf, count);
-		if (tmp > 0) {
-			count -= tmp;
-			if (count)
-				buf += tmp;
-		} else if (errno != EINTR && errno != EAGAIN)
-			return -1;
-		if (errno == EAGAIN)	/* Try later, *sigh* */
-			usleep(10000);
-	}
-	return 0;
-}
-
-static inline int fwrite_all(const void *ptr, size_t size,
-			     size_t nmemb, FILE *stream)
-{
-	while (nmemb) {
-		size_t tmp;
-
-		errno = 0;
-		tmp = fwrite(ptr, size, nmemb, stream);
-		if (tmp > 0) {
-			nmemb -= tmp;
-			if (nmemb)
-				ptr += (tmp * size);
-		} else if (errno != EINTR && errno != EAGAIN)
-			return -1;
-		if (errno == EAGAIN)	/* Try later, *sigh* */
-			usleep(10000);
-	}
-	return 0;
-}
-
-#endif /* UTIL_LINUX_WRITEALL_H */
diff --git a/lib/path.c b/lib/path.c
index ad17fef..0d4d391 100644
--- a/lib/path.c
+++ b/lib/path.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "writeall.h"
+#include "all-io.h"
 #include "cpuset.h"
 #include "path.h"
 #include "nls.h"
diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 6bd69d3..ce14526 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -109,7 +109,7 @@
 #endif
 
 #include "blkidP.h"
-#include "writeall.h"
+#include "all-io.h"
 
 /* chains */
 extern const struct blkid_chaindrv superblocks_drv;
diff --git a/login-utils/login.c b/login-utils/login.c
index 23b84a1..2b5c68d 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -66,7 +66,7 @@
 #include "strutils.h"
 #include "nls.h"
 #include "xalloc.h"
-#include "writeall.h"
+#include "all-io.h"
 #include "fileutils.h"
 
 #include "logindefs.h"
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index eb1ef02..65ee55a 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -33,7 +33,7 @@ extern int optind;
 
 #include "uuid.h"
 #include "uuidd.h"
-#include "writeall.h"
+#include "all-io.h"
 #include "c.h"
 #include "closestream.h"
 
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index a9d74f0..c751c3a 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -35,7 +35,7 @@
 #include "nls.h"
 #include "xalloc.h"
 #include "strutils.h"
-#include "writeall.h"
+#include "all-io.h"
 #include "match.h"
 #include "c.h"
 #include "closestream.h"
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index b47fede..e47b087 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -27,7 +27,7 @@
 #include "strutils.h"
 #include "xalloc.h"
 #include "widechar.h"
-#include "writeall.h"
+#include "all-io.h"
 #include "bitops.h"
 #include "closestream.h"
 
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index bed4cde..36e00eb 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -33,7 +33,7 @@
 #include <grp.h>
 
 #include "strutils.h"
-#include "writeall.h"
+#include "all-io.h"
 #include "nls.h"
 #include "pathnames.h"
 #include "c.h"
diff --git a/text-utils/pg.c b/text-utils/pg.c
index 2b51442..0bd8279 100644
--- a/text-utils/pg.c
+++ b/text-utils/pg.c
@@ -62,7 +62,7 @@
 #include "nls.h"
 #include "xalloc.h"
 #include "widechar.h"
-#include "writeall.h"
+#include "all-io.h"
 #include "closestream.h"
 
 #define	READBUF		LINE_MAX	/* size of input buffer */
-- 
1.7.7

[PATCH 2/4] libuuid,uuidd: move read_all to include/all-io.h

[Petr Uzel]

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---
 include/all-io.h       |   25 +++++++++++++++++++++++++
 libuuid/src/gen_uuid.c |   26 +-------------------------
 misc-utils/uuidd.c     |   24 ------------------------
 3 files changed, 26 insertions(+), 49 deletions(-)

diff --git a/include/all-io.h b/include/all-io.h
index 4d1ae1e..b79d702 100644
--- a/include/all-io.h
+++ b/include/all-io.h
@@ -44,4 +44,29 @@ static inline int fwrite_all(const void *ptr, size_t size,
 	return 0;
 }
 
+static inline ssize_t read_all(int fd, char *buf, size_t count)
+{
+	ssize_t ret;
+	ssize_t c = 0;
+	int tries = 0;
+
+	memset(buf, 0, count);
+	while (count > 0) {
+		ret = read(fd, buf, count);
+		if (ret <= 0) {
+			if ((errno == EAGAIN || errno == EINTR || ret == 0) &&
+			    (tries++ < 5))
+				continue;
+			return c ? c : -1;
+		}
+		if (ret > 0)
+			tries = 0;
+		count -= ret;
+		buf += ret;
+		c += ret;
+	}
+	return c;
+}
+
+
 #endif /* UTIL_LINUX_ALL_IO_H */
diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c
index 93d292a..9d5575b 100644
--- a/libuuid/src/gen_uuid.c
+++ b/libuuid/src/gen_uuid.c
@@ -87,6 +87,7 @@
 #include <sys/syscall.h>
 #endif
 
+#include "all-io.h"
 #include "uuidP.h"
 #include "uuidd.h"
 #include "randutils.h"
@@ -334,31 +335,6 @@ try_again:
 }
 
 #if defined(HAVE_UUIDD) && defined(HAVE_SYS_UN_H)
-/* used in get_uuid_via_daemon() only */
-static ssize_t read_all(int fd, char *buf, size_t count)
-{
-	ssize_t ret;
-	ssize_t c = 0;
-	int tries = 0;
-
-	memset(buf, 0, count);
-	while (count > 0) {
-		ret = read(fd, buf, count);
-		if (ret <= 0) {
-			if ((errno == EAGAIN || errno == EINTR || ret == 0) &&
-			    (tries++ < 5))
-				continue;
-			return c ? c : -1;
-		}
-		if (ret > 0)
-			tries = 0;
-		count -= ret;
-		buf += ret;
-		c += ret;
-	}
-	return c;
-}
-
 /*
  * Try using the uuidd daemon to generate the UUID
  *
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 65ee55a..3dde49e 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -101,30 +101,6 @@ static void create_daemon(void)
 		err(EXIT_FAILURE, "setreuid");
 }
 
-static ssize_t read_all(int fd, char *buf, size_t count)
-{
-	ssize_t ret;
-	ssize_t c = 0;
-	int tries = 0;
-
-	memset(buf, 0, count);
-	while (count > 0) {
-		ret = read(fd, buf, count);
-		if (ret <= 0) {
-			if ((errno == EAGAIN || errno == EINTR || ret == 0) &&
-			    (tries++ < 5))
-				continue;
-			return c ? c : -1;
-		}
-		if (ret > 0)
-			tries = 0;
-		count -= ret;
-		buf += ret;
-		c += ret;
-	}
-	return c;
-}
-
 static const char *cleanup_pidfile, *cleanup_socket;
 
 static void terminate_intr(int signo CODE_ATTR((unused)))
-- 
1.7.7

Re: [PATCH 2/4] libuuid,uuidd: move read_all to include/all-io.h

[Karel Zak]

On Tue, May 15, 2012 at 10:49:02AM +0200, Petr Uzel wrote:
>  include/all-io.h       |   25 +++++++++++++++++++++++++
>  libuuid/src/gen_uuid.c |   26 +-------------------------
>  misc-utils/uuidd.c     |   24 ------------------------
>  3 files changed, 26 insertions(+), 49 deletions(-)

 Applied, thanks.

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

[PATCH 3/4] lib,include: move get_terminal_width() to ttyutils.h

[Petr Uzel]

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---
 include/ttyutils.h |   29 +++++++++++++++++++++++++++++
 lib/tt.c           |   28 +---------------------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/include/ttyutils.h b/include/ttyutils.h
index f638aa0..15809e8 100644
--- a/include/ttyutils.h
+++ b/include/ttyutils.h
@@ -1,7 +1,11 @@
 #ifndef UTIL_LINUX_TTYUTILS_H
 #define UTIL_LINUX_TTYUTILS_H
 
+#include <stdlib.h>
 #include <termios.h>
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
 
 #define UL_TTY_KEEPCFLAGS	(1 << 1)
 #define UL_TTY_UTF8		(1 << 2)
@@ -74,4 +78,29 @@ static inline void reset_virtual_console(struct termios *tp, int flags)
 	tp->c_cc[VEOL2]    = _POSIX_VDISABLE;
 }
 
+static inline int get_terminal_width(void)
+{
+#ifdef TIOCGSIZE
+	struct ttysize	t_win;
+#endif
+#ifdef TIOCGWINSZ
+	struct winsize	w_win;
+#endif
+        const char	*cp;
+
+#ifdef TIOCGSIZE
+	if (ioctl (0, TIOCGSIZE, &t_win) == 0)
+		return t_win.ts_cols;
+#endif
+#ifdef TIOCGWINSZ
+	if (ioctl (0, TIOCGWINSZ, &w_win) == 0)
+		return w_win.ws_col;
+#endif
+        cp = getenv("COLUMNS");
+	if (cp)
+		return strtol(cp, NULL, 10);
+	return 0;
+}
+
+
 #endif /* UTIL_LINUX_TTYUTILS_H */
diff --git a/lib/tt.c b/lib/tt.c
index 1b5fbac..fe471d0 100644
--- a/lib/tt.c
+++ b/lib/tt.c
@@ -16,15 +16,13 @@
 #include <string.h>
 #include <termios.h>
 #include <ctype.h>
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
 
 #include "c.h"
 #include "nls.h"
 #include "widechar.h"
 #include "tt.h"
 #include "mbsalign.h"
+#include "ttyutils.h"
 
 struct tt_symbols {
 	const char *branch;
@@ -253,30 +251,6 @@ int tt_line_set_data(struct tt_line *ln, int colnum, const char *data)
 	return 0;
 }
 
-static int get_terminal_width(void)
-{
-#ifdef TIOCGSIZE
-	struct ttysize	t_win;
-#endif
-#ifdef TIOCGWINSZ
-	struct winsize	w_win;
-#endif
-        const char	*cp;
-
-#ifdef TIOCGSIZE
-	if (ioctl (0, TIOCGSIZE, &t_win) == 0)
-		return t_win.ts_cols;
-#endif
-#ifdef TIOCGWINSZ
-	if (ioctl (0, TIOCGWINSZ, &w_win) == 0)
-		return w_win.ws_col;
-#endif
-        cp = getenv("COLUMNS");
-	if (cp)
-		return strtol(cp, NULL, 10);
-	return 0;
-}
-
 int tt_line_set_userdata(struct tt_line *ln, void *data)
 {
 	if (!ln)
-- 
1.7.7

Re: [PATCH 3/4] lib,include: move get_terminal_width() to ttyutils.h

[Karel Zak]

On Tue, May 15, 2012 at 10:49:03AM +0200, Petr Uzel wrote:
>  include/ttyutils.h |   29 +++++++++++++++++++++++++++++
>  lib/tt.c           |   28 +---------------------------
>  2 files changed, 30 insertions(+), 27 deletions(-)

 Applied, thanks.

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

[PATCH 4/4] blkid: use get_terminal_width() from ttyutils.h

[Petr Uzel]

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---
 misc-utils/blkid.c |   29 +----------------------------
 1 files changed, 1 insertions(+), 28 deletions(-)

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 6a7991f..aec3528 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -16,11 +16,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <termios.h>
 #include <errno.h>
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #else
@@ -45,6 +41,7 @@ extern int optind;
 #define STRTOXX_EXIT_CODE	4		/* strtoxx_or_err() */
 #include "strutils.h"
 #include "closestream.h"
+#include "ttyutils.h"
 
 const char *progname = "blkid";
 
@@ -124,30 +121,6 @@ static void safe_print(const char *cp, int len)
 	}
 }
 
-static int get_terminal_width(void)
-{
-#ifdef TIOCGSIZE
-	struct ttysize	t_win;
-#endif
-#ifdef TIOCGWINSZ
-	struct winsize	w_win;
-#endif
-        const char	*cp;
-
-#ifdef TIOCGSIZE
-	if (ioctl (0, TIOCGSIZE, &t_win) == 0)
-		return (t_win.ts_cols);
-#endif
-#ifdef TIOCGWINSZ
-	if (ioctl (0, TIOCGWINSZ, &w_win) == 0)
-		return (w_win.ws_col);
-#endif
-        cp = getenv("COLUMNS");
-	if (cp)
-		return strtol(cp, NULL, 10);
-	return 80;
-}
-
 static int pretty_print_word(const char *str, int max_len,
 			     int left_len, int overflow_nl)
 {
-- 
1.7.7

Re: [PATCH 4/4] blkid: use get_terminal_width() from ttyutils.h

[Karel Zak]

On Tue, May 15, 2012 at 10:49:04AM +0200, Petr Uzel wrote:
>  misc-utils/blkid.c |   29 +----------------------------
>  1 files changed, 1 insertions(+), 28 deletions(-)
                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Applied, thanks. (I love such patches :-)

    Karel

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

Re: [PATCH 1/4] include: rename writeall.h to all-io.h

[Karel Zak]

On Tue, May 15, 2012 at 10:49:01AM +0200, Petr Uzel wrote:
>  disk-utils/fsck.minix.c |    2 +-
>  disk-utils/mkfs.minix.c |    2 +-
>  disk-utils/mkswap.c     |    2 +-
>  disk-utils/swaplabel.c  |    2 +-
>  include/Makefile.am     |    2 +-
>  include/all-io.h        |   47 +++++++++++++++++++++++++++++++++++++++++++++++
>  include/writeall.h      |   47 -----------------------------------------------
>  lib/path.c              |    2 +-
>  libblkid/src/probe.c    |    2 +-
>  login-utils/login.c     |    2 +-
>  misc-utils/uuidd.c      |    2 +-
>  misc-utils/wipefs.c     |    2 +-
>  sys-utils/dmesg.c       |    2 +-
>  term-utils/agetty.c     |    2 +-
>  text-utils/pg.c         |    2 +-
>  15 files changed, 60 insertions(+), 60 deletions(-)
>  create mode 100644 include/all-io.h
>  delete mode 100644 include/writeall.h

 Applied, thanks!

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