gmane.linux.utilities.util-linux-ng

Portability patches for GNU/Hurd

Thomas Schwinge — 2012-05-25T18:13:40

Hi!

The subject says is all.  :-)


Grüße,
 Thomas

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA< at >public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] kill: Check the correct variable when configuring.

Thomas Schwinge — 2012-05-25T18:11:22

Signed-off-by: Thomas Schwinge <thomas-qD8j1LwMmJjtCj0u4l0SBw< at >public.gmane.org>
---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index a1b1e9b..eb67ada 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -976,7 +976,7 < at >< at > AC_ARG_ENABLE([kill],
 )
 UL_BUILD_INIT([kill])
 UL_REQUIRES_LINUX([kill])
-AM_CONDITIONAL(BUILD_KILL, test "x$enable_kill" = xyes)
+AM_CONDITIONAL(BUILD_KILL, test "x$build_kill" = xyes)
 
 
 AC_ARG_ENABLE([last],

[PULL] su

Ludwig Nussel — 2012-05-24T12:58:01

Hi,

coreutils isn't really interested in maintaining su anymore.
Distributions have to add custom patches to fix bugs and add
features. The worst offender is probably the pam patch. Fortunately
we managed to sync the patch between openSUSE and Fedora meanwhile.
Over time the risk that the patches divert again increases though.
Since util-linux now contains a common login program it looks like a
good new home for su too.

To integrate su into util-linux I've extracted the history of the su
program until the last GPLv2 version (they've changed to GPLv3
meanwhile) from coreutils' git and merged it with util-linux.
Then I've added the patches used in Fedora and openSUSE and fixed the
files to actually build.

You can find the result in branch su-v1 (ff6b15d) at
git-9UaJU3cA/F/QT0dZR+AlfA< at >public.gmane.org:lnussel/util-linux.git

I've also filed a pull request on github:
https://github.com/karelzak/util-linux/pull/10

Originally I had planned to implement separate tty allocation for
the child program on top of that to get rid of the evil setsid
patch. It turned out to be more complicated than I thought though. The
change would be too massive to backport anyways I guess. So the next
step would be to rip out the non-pam legacy stuff and clean up the code
to make it readable again.

cu
Ludwig

[PATCH 1/3] logger: avoid explicit fclose(stdout)

Dave Reisner — 2012-05-23T20:35:58

This is done for us via an atexit hook since c05a80ca6385b8. Avoids a
useless 'Write error' on exit whenever invoking the tool.

Signed-off-by: Dave Reisner <dreisner-fd97jBR+K/6hPH1hqNUYSQ< at >public.gmane.org>
---
 misc-utils/logger.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 067272a..19b4c47 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
< at >< at > -248,8 +248,6 < at >< at > main(int argc, char **argv) {
 else
 LogSock = myopenlog(usock);
 
-(void) fclose(stdout);

[PATCH] misc-utils: cleanup unused strings.h includes

maximilian attems — 2012-05-22T14:33:23

Noticed on klibc building.

Signed-off-by: maximilian attems <max-U9r9yeDMy7A< at >public.gmane.org>
---
 misc-utils/kill.c   |    1 -
 misc-utils/logger.c |    1 -
 misc-utils/namei.c  |    1 -
 3 files changed, 3 deletions(-)

diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index da7c8ab..c592f52 100644
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
< at >< at > -45,7 +45,6 < at >< at >
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <ctype.h>/* for isdigit() */
 #include <unistd.h>
 #include <signal.h>
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index db3469c..9805a7d 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
< at >< at > -43,7 +43,6 < at >< at >
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <strings.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index b15d4f7..fc1689d 100644
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
< at >< at > -24,7 +24,6 < at >< at >
 #include <unistd.h>
 #include <getopt.h>
 #include <string.h>
-#include <strings.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>

[PATCH] include: [c.h] protect container_of

maximilian attems — 2012-05-22T14:20:42

fixes lots of warning noise:
../../../include/c.h:112:0: warning: "container_of" redefined [enabled
by default]
/usr/lib/klibc/include/stddef.h:52:0: note: this is the location of the
previous definition

Signed-off-by: maximilian attems <max-U9r9yeDMy7A< at >public.gmane.org>
---
 include/c.h |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/c.h b/include/c.h
index b6d8ced..8c8db73 100644
--- a/include/c.h
+++ b/include/c.h
< at >< at > -109,9 +109,11 < at >< at >
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
 
+#ifndef container_of
 #define container_of(ptr, type, member) ({                       \
 const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \
 (type *)( (char *)__mptr - offsetof(type,member) );})
+#endif
 
 #ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
 # ifdef HAVE___PROGNAME

[PATCH 5/6] fdisk: introduce fdisk context

Davidlohr Bueso — 2012-05-20T16:11:36

From: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>

This is the first patch that adds the initial parts of the new fdisk internal API. Two functions are created to both init and deinit the fdisk
context. Only the device's descriptor and path are added as a start and these are replaced throughout fdisk.c and label specific code.

All logic that opens the file does it with fdisk_new_context_from_filename(), and this enforces always opening the device with rw, then, if
unsuccessful, with read-only. This changes the current logic that opens the device with certain permissions depending on the user given options.
For example, -l opens the device read-only.

This patch passed regression tests and local modifications for sgi/dos/sun disk labels.

Signed-off-by: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>
---
 fdisk/Makefile.am     |    1 +
 fdisk/fdisk.c         |   82 ++++++++++++++++++++++--------------------------
 fdisk/fdisk.h         |    9 +++++
 fdisk/fdiskbsdlabel.c |   44 +++++++++++++-------------
 fdisk/fdiskdoslabel.c |    6 ++--
 fdisk/fdisksgilabel.c |   24 +++++++-------
 fdisk/fdisksunlabel.c |   18 +++++-----
 fdisk/utils.c         |   71 ++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 165 insertions(+), 90 deletions(-)
 create mode 100644 fdisk/utils.c

diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am
index 7851bd1..e9be841 100644
--- a/fdisk/Makefile.am
+++ b/fdisk/Makefile.am
< at >< at > -20,6 +20,7 < at >< at > if !ARCH_M68K
 sbin_PROGRAMS = fdisk
 dist_man_MANS = fdisk.8
 fdisk_SOURCES = \
+utils.c \
 fdisk.c \
 fdisk.h \
 fdiskaixlabel.c \
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index b6c5758..400e682 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
< at >< at > -55,6 +55,7 < at >< at >
 
 unsigned char *MBRbuffer;
 int MBRbuffer_changed;
+struct fdisk_context *cxt = NULL;
 
 #define hex_val(c)({ \
 char _c = (c); \
< at >< at > -130,12 +131,10 < at >< at > get_nr_sects(struct partition *p) {
 return read4_little_endian(p->size4);
 }
 
-char*disk_device,/* must be specified */
-*line_ptr,/* interactive input */
+char*line_ptr,/* interactive input */
 line_buffer[LINE_LENGTH];
 
-intfd,/* the disk */
-nowarn = 0,/* no warnings for fdisk -l/-s */
+intnowarn = 0,/* no warnings for fdisk -l/-s */
 dos_compatible_flag = 0,/* disabled by default */
 dos_changed = 0,
 partitions = 4;/* maximum partition + 1 */
< at >< at > -183,19 +182,19 < at >< at > static void __attribute__ ((__noreturn__)) usage(FILE *out)
 
 void fatal(enum failure why)
 {
-close(fd);
+close(cxt->dev_fd);
 switch (why) {
 case unable_to_read:
-err(EXIT_FAILURE, _("unable to read %s"), disk_device);
+err(EXIT_FAILURE, _("unable to read %s"), cxt->dev_path);
 
 case unable_to_seek:
-err(EXIT_FAILURE, _("unable to seek on %s"), disk_device);
+err(EXIT_FAILURE, _("unable to seek on %s"), cxt->dev_path);
 
 case unable_to_write:
-err(EXIT_FAILURE, _("unable to write %s"), disk_device);
+err(EXIT_FAILURE, _("unable to write %s"), cxt->dev_path);
 
 case ioctl_error:
-err(EXIT_FAILURE, _("BLKGETSIZE ioctl failed on %s"), disk_device);
+err(EXIT_FAILURE, _("BLKGETSIZE ioctl failed on %s"), cxt->dev_path);
 
 default:
 err(EXIT_FAILURE, _("fatal error"));
< at >< at > -460,7 +459,7 < at >< at > get_topology(int fd) {
 blkid_probe pr;
 
 pr = blkid_new_probe();
-if (pr && blkid_probe_set_device(pr, fd, 0, 0) == 0) {
+if (pr && blkid_probe_set_device(pr, cxt->dev_fd, 0, 0) == 0) {
 blkid_topology tp = blkid_probe_get_topology(pr);
 
 if (tp) {
< at >< at > -494,7 +493,7 < at >< at > get_topology(int fd) {
  */
 phy_sector_size = sector_size;
 
-else if (blkdev_get_sector_size(fd, &arg) == 0) {
+else if (blkdev_get_sector_size(cxt->dev_fd, &arg) == 0) {
 sector_size = arg;
 
 if (!phy_sector_size)
< at >< at > -664,24 +663,13 < at >< at > static int get_boot(int try_only) {
 disklabel = ANY_LABEL;
 memset(MBRbuffer, 0, 512);
 
-if (try_only && (fd = open(disk_device, O_RDONLY)) < 0)
-err(EXIT_FAILURE, _("unable to open %s"), disk_device);
-else {
-if ((fd = open(disk_device, O_RDWR)) < 0) {
-/* ok, can we read-only the device? */
-if ((fd = open(disk_device, O_RDONLY)) < 0)
-err(EXIT_FAILURE, _("unable to open %s"), disk_device);
-printf(_("You will not be able to write the partition table.\n"));
-}
-}
-
-if (512 != read(fd, MBRbuffer, 512)) {
+if (512 != read(cxt->dev_fd, MBRbuffer, 512)) {
 if (try_only)
 return 1;
 fatal(unable_to_read);
 }
 
-get_geometry(fd, NULL);
+get_geometry(cxt->dev_fd, NULL);
 update_units();
 
 if (!check_dos_label())
< at >< at > -1232,11 +1220,11 < at >< at > list_disk_geometry(void) {
 
 if (megabytes < 10000)
 printf(_("\nDisk %s: %ld MB, %lld bytes\n"),
-       disk_device, megabytes, bytes);
+       cxt->dev_path, megabytes, bytes);
 else {
 long hectomega = (megabytes + 50) / 100;
 printf(_("\nDisk %s: %ld.%ld GB, %llu bytes\n"),
-       disk_device, hectomega / 10, hectomega % 10, bytes);
+       cxt->dev_path, hectomega / 10, hectomega % 10, bytes);
 }
 printf(_("%d heads, %llu sectors/track, %d cylinders"),
        heads, sectors, cylinders);
< at >< at > -1424,8 +1412,8 < at >< at > list_table(int xtra) {
 /* Heuristic: we list partition 3 of /dev/foo as /dev/foo3,
    but if the device name ends in a digit, say /dev/foo1,
    then the partition is called /dev/foo1p3. */
-w = strlen(disk_device);
-if (w && isdigit(disk_device[w-1]))
+w = strlen(cxt->dev_path);
+if (w && isdigit(cxt->dev_path[w-1]))
 w++;
 if (w < 5)
 w = 5;
< at >< at > -1450,7 +1438,7 < at >< at > list_table(int xtra) {
 pblocks *= (sector_size / 1024);
                         printf(
     "%s  %c %11lu %11lu %11lu%c  %2x  %s\n",
-partname(disk_device, i+1, w+2),
+partname(cxt->dev_path, i+1, w+2),
 /* boot flag */!p->boot_ind ? ' ' : p->boot_ind == ACTIVE_FLAG
 ? '*' : '?',
 /* start */(unsigned long) cround(get_partition_start(pe)),
< at >< at > -1480,7 +1468,7 < at >< at > x_list_table(int extend) {
 int i;
 
 printf(_("\nDisk %s: %d heads, %llu sectors, %d cylinders\n\n"),
-disk_device, heads, sectors, cylinders);
+cxt->dev_path, heads, sectors, cylinders);
         printf(_("Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"));
 for (i = 0 ; i < partitions; i++) {
 pe = &ptes[i];
< at >< at > -1695,12 +1683,12 < at >< at > reread_partition_table(int leave) {
 int i;
 struct stat statbuf;
 
-i = fstat(fd, &statbuf);
+i = fstat(cxt->dev_fd, &statbuf);
 if (i == 0 && S_ISBLK(statbuf.st_mode)) {
 sync();
 #ifdef BLKRRPART
 printf(_("Calling ioctl() to re-read partition table.\n"));
-i = ioctl(fd, BLKRRPART);
+i = ioctl(cxt->dev_fd, BLKRRPART);
 #else
 errno = ENOSYS;
 i = 1;
< at >< at > -1721,7 +1709,7 < at >< at > reread_partition_table(int leave) {
 "information.\n"));
 
 if (leave) {
-if (fsync(fd) || close(fd)) {
+if (fsync(cxt->dev_fd) || close(cxt->dev_fd)) {
 fprintf(stderr, _("\nError closing file\n"));
 exit(1);
 }
< at >< at > -1755,7 +1743,7 < at >< at > static void
 print_raw(void) {
 int i;
 
-printf(_("Device: %s\n"), disk_device);
+printf(_("Device: %s\n"), cxt->dev_path);
 if (disklabel == SUN_LABEL || disklabel == SGI_LABEL)
 print_buffer(MBRbuffer);
 else for (i = 3; i < partitions; i++)
< at >< at > -1811,9 +1799,9 < at >< at > move_begin(int i) {
 }
 }
 
-static void __attribute__ ((__noreturn__)) handle_quit(void)
+static void __attribute__ ((__noreturn__)) handle_quit(struct fdisk_context *cxt)
 {
-close(fd);
+fdisk_free_context(cxt);
 printf("\n");
 exit(EXIT_SUCCESS);
 }
< at >< at > -1883,7 +1871,7 < at >< at > expert_command_prompt(void)
 x_list_table(0);
 break;
 case 'q':
-handle_quit();
+handle_quit(cxt);
 case 'r':
 return;
 case 's':
< at >< at > -1939,7 +1927,10 < at >< at > print_partition_table_from_option(char *device)
 {
 int gb;
 
-disk_device = device;
+cxt = fdisk_new_context_from_filename(device);
+if (!cxt)
+err(EXIT_FAILURE, _("unable to open %s"), device);
+
 gpt_warning(device);
 gb = get_boot(1);
 if (gb < 0) { /* no DOS signature */
< at >< at > -1949,7 +1940,7 < at >< at > print_partition_table_from_option(char *device)
 }
 else if (!gb)
 list_table(0);
-close(fd);
+fdisk_free_context(cxt);
 }
 
 /*
< at >< at > -2001,7 +1992,7 < at >< at > static void command_prompt(void)
 /* OSF label, and no DOS label */
 printf(_("Detected an OSF/1 disklabel on %s, entering "
  "disklabel mode.\n"),
-       disk_device);
+       cxt->dev_path);
 bsd_command_prompt();
 /* If we return we may want to make an empty DOS label? */
 disklabel = DOS_LABEL;
< at >< at > -2070,7 +2061,7 < at >< at > static void command_prompt(void)
 list_table(0);
 break;
 case 'q':
-handle_quit();
+handle_quit(cxt);
 case 's':
 create_sunlabel();
 break;
< at >< at > -2209,8 +2200,11 < at >< at > int main(int argc, char **argv)
 exit(EXIT_SUCCESS);
 }
 
-if (argc-optind == 1)
-disk_device = argv[optind];
+if (argc-optind == 1) {
+cxt = fdisk_new_context_from_filename(argv[optind]);
+if (!cxt)
+err(EXIT_FAILURE, _("unable to open %s"), argv[optind]);
+}
 else
 usage(stderr);
 
< at >< at > -2218,7 +2212,7 < at >< at > int main(int argc, char **argv)
 "Changes will remain in memory only, until you decide to write them.\n"
 "Be careful before using the write command.\n\n"), PACKAGE_STRING);
 
-gpt_warning(disk_device);
+gpt_warning(cxt->dev_path);
 get_boot(0);
 
 command_prompt();
diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index 82888dc..c43517c 100644
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
< at >< at > -63,6 +63,15 < at >< at > struct geom {
 unsigned int cylinders;
 };
 
+struct fdisk_context {
+int dev_fd;     /* device descriptor */
+char *dev_path; /* device path */
+};
+
+extern struct fdisk_context *cxt;
+extern struct fdisk_context *fdisk_new_context_from_filename(const char *fname);
+extern void fdisk_free_context(struct fdisk_context *cxt);
+
 /* prototypes for fdisk.c */
 extern char *disk_device, *line_ptr;
 extern int fd, partitions;
diff --git a/fdisk/fdiskbsdlabel.c b/fdisk/fdiskbsdlabel.c
index 9dfc95a..670e9bc 100644
--- a/fdisk/fdiskbsdlabel.c
+++ b/fdisk/fdiskbsdlabel.c
< at >< at > -153,11 +153,11 < at >< at > bsd_command_prompt (void)
       ss = get_start_sect(xbsd_part);
       if (ss == 0) {
 fprintf (stderr, _("Partition %s has invalid starting sector 0.\n"),
- partname(disk_device, t+1, 0));
+ partname(cxt->dev_path, t+1, 0));
 return;
       }
       printf (_("Reading disklabel of %s at sector %d.\n"),
-      partname(disk_device, t+1, 0), ss + BSD_LABELSECTOR);
+      partname(cxt->dev_path, t+1, 0), ss + BSD_LABELSECTOR);
       if (xbsd_readlabel (xbsd_part, &xbsd_dlabel) == 0)
 if (xbsd_create_disklabel () == 0)
   return;
< at >< at > -166,7 +166,7 < at >< at > bsd_command_prompt (void)
   }
 
   if (t == 4) {
-    printf (_("There is no *BSD partition on %s.\n"), disk_device);
+    printf (_("There is no *BSD partition on %s.\n"), cxt->dev_path);
     return;
   }
 
< at >< at > -200,7 +200,7 < at >< at > bsd_command_prompt (void)
 xbsd_print_disklabel (0);
 break;
       case 'q':
-close (fd);
+close (cxt->dev_fd);
 exit ( EXIT_SUCCESS );
       case 'r':
 return;
< at >< at > -289,9 +289,9 < at >< at > xbsd_print_disklabel (int show_all) {
 
   if (show_all) {
 #if defined (__alpha__)
-    fprintf(f, "# %s:\n", disk_device);
+    fprintf(f, "# %s:\n", cxt->dev_path);
 #else
-    fprintf(f, "# %s:\n", partname(disk_device, xbsd_part_index+1, 0));
+    fprintf(f, "# %s:\n", partname(cxt->dev_path, xbsd_part_index+1, 0));
 #endif
     if ((unsigned) lp->d_type < BSD_DKMAXTYPES)
       fprintf(f, _("type: %s\n"), xbsd_dktypenames[lp->d_type]);
< at >< at > -381,11 +381,11 < at >< at > xbsd_print_disklabel (int show_all) {
 static void
 xbsd_write_disklabel (void) {
 #if defined (__alpha__)
-printf (_("Writing disklabel to %s.\n"), disk_device);
+printf (_("Writing disklabel to %s.\n"), cxt->dev_path);
 xbsd_writelabel (NULL, &xbsd_dlabel);
 #else
 printf (_("Writing disklabel to %s.\n"),
-partname(disk_device, xbsd_part_index+1, 0));
+partname(cxt->dev_path, xbsd_part_index+1, 0));
 xbsd_writelabel (xbsd_part, &xbsd_dlabel);
 #endif
 reread_partition_table(0);/* no exit yet */
< at >< at > -396,10 +396,10 < at >< at > xbsd_create_disklabel (void) {
 char c;
 
 #if defined (__alpha__)
-fprintf (stderr, _("%s contains no disklabel.\n"), disk_device);
+fprintf (stderr, _("%s contains no disklabel.\n"), cxt->dev_path);
 #else
 fprintf (stderr, _("%s contains no disklabel.\n"),
- partname(disk_device, xbsd_part_index+1, 0));
+ partname(cxt->dev_path, xbsd_part_index+1, 0));
 #endif
 
 while (1) {
< at >< at > -545,16 +545,16 < at >< at > xbsd_write_bootstrap (void)
   sector = get_start_sect(xbsd_part);
 #endif
 
-  if (lseek (fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1)
+  if (lseek (cxt->dev_fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1)
     fatal (unable_to_seek);
-  if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE))
+  if (BSD_BBSIZE != write (cxt->dev_fd, disklabelbuffer, BSD_BBSIZE))
     fatal (unable_to_write);
 
 #if defined (__alpha__)
-  printf (_("Bootstrap installed on %s.\n"), disk_device);
+  printf (_("Bootstrap installed on %s.\n"), cxt->dev_path);
 #else
   printf (_("Bootstrap installed on %s.\n"),
-    partname (disk_device, xbsd_part_index+1, 0));
+    partname (cxt->dev_path, xbsd_part_index+1, 0));
 #endif
 
   sync_disks ();
< at >< at > -636,12 +636,12 < at >< at > xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d,
 struct xbsd_partition *pp;
 struct geom g;
 
-get_geometry (fd, &g);
+get_geometry (cxt->dev_fd, &g);
 memset (d, 0, sizeof (struct xbsd_disklabel));
 
 d -> d_magic = BSD_DISKMAGIC;
 
-if (strncmp (disk_device, "/dev/sd", 7) == 0)
+if (strncmp (cxt->dev_path, "/dev/sd", 7) == 0)
 d -> d_type = BSD_DTYPE_SCSI;
 else
 d -> d_type = BSD_DTYPE_ST506;
< at >< at > -715,9 +715,9 < at >< at > xbsd_readlabel (struct partition *p, struct xbsd_disklabel *d)
 sector = 0;
 #endif
 
-if (lseek (fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1)
+if (lseek (cxt->dev_fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1)
 fatal (unable_to_seek);
-if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE))
+if (BSD_BBSIZE != read (cxt->dev_fd, disklabelbuffer, BSD_BBSIZE))
 fatal (unable_to_read);
 
 memmove (d,
< at >< at > -762,15 +762,15 < at >< at > xbsd_writelabel (struct partition *p, struct xbsd_disklabel *d)
 
 #if defined (__alpha__) && BSD_LABELSECTOR == 0
   alpha_bootblock_checksum (disklabelbuffer);
-  if (lseek (fd, (off_t) 0, SEEK_SET) == -1)
+  if (lseek (cxt->dev_fd, (off_t) 0, SEEK_SET) == -1)
     fatal (unable_to_seek);
-  if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE))
+  if (BSD_BBSIZE != write (cxt->dev_fd, disklabelbuffer, BSD_BBSIZE))
     fatal (unable_to_write);
 #else
-  if (lseek (fd, (off_t) sector * SECTOR_SIZE + BSD_LABELOFFSET,
+  if (lseek (cxt->dev_fd, (off_t) sector * SECTOR_SIZE + BSD_LABELOFFSET,
    SEEK_SET) == -1)
     fatal (unable_to_seek);
-  if (sizeof (struct xbsd_disklabel) != write (fd, d, sizeof (struct xbsd_disklabel)))
+  if (sizeof (struct xbsd_disklabel) != write (cxt->dev_fd, d, sizeof (struct xbsd_disklabel)))
     fatal (unable_to_write);
 #endif
 
diff --git a/fdisk/fdiskdoslabel.c b/fdisk/fdiskdoslabel.c
index 34bcde6..4a93691 100644
--- a/fdisk/fdiskdoslabel.c
+++ b/fdisk/fdiskdoslabel.c
< at >< at > -156,7 +156,7 < at >< at > static void read_extended(int ext)
 return;
 }
 
-read_pte(fd, partitions, extended_offset + get_start_sect(p));
+read_pte(cxt->dev_fd, partitions, extended_offset + get_start_sect(p));
 
 if (!extended_offset)
 extended_offset = get_start_sect(p);
< at >< at > -670,7 +670,7 < at >< at > void dos_write_table(void)
 }
 if (MBRbuffer_changed) {
 write_part_table_flag(MBRbuffer);
-write_sector(fd, 0, MBRbuffer);
+write_sector(cxt->dev_fd, 0, MBRbuffer);
 }
 /* EBR (logical partitions) */
 for (i = 4; i < partitions; i++) {
< at >< at > -678,7 +678,7 < at >< at > void dos_write_table(void)
 
 if (pe->changed) {
 write_part_table_flag(pe->sectorbuffer);
-write_sector(fd, pe->offset, pe->sectorbuffer);
+write_sector(cxt->dev_fd, pe->offset, pe->sectorbuffer);
 }
 }
 }
diff --git a/fdisk/fdisksgilabel.c b/fdisk/fdisksgilabel.c
index 5e851bc..c2ef06d 100644
--- a/fdisk/fdisksgilabel.c
+++ b/fdisk/fdisksgilabel.c
< at >< at > -183,7 +183,7 < at >< at > sgi_list_table(int xtra) {
 int kpi = 0;/* kernel partition ID */
 char *type;
 
-w = strlen(disk_device);
+w = strlen(cxt->dev_path);
 
 if (xtra) {
 printf(_("\nDisk %s (SGI disk label): %d heads, %llu sectors\n"
< at >< at > -191,7 +191,7 < at >< at > sgi_list_table(int xtra) {
  "%d extra sects/cyl, interleave %d:1\n"
  "%s\n"
  "Units = %s of %d * %d bytes\n\n"),
-       disk_device, heads, sectors, cylinders,
+       cxt->dev_path, heads, sectors, cylinders,
        SSWAP16(sgiparam.pcylcount),
        (int) sgiparam.sparecyl, SSWAP16(sgiparam.ilfact),
        (char *)sgilabel,
< at >< at > -201,7 +201,7 < at >< at > sgi_list_table(int xtra) {
 printf(_("\nDisk %s (SGI disk label): "
  "%d heads, %llu sectors, %d cylinders\n"
  "Units = %s of %d * %d bytes\n\n"),
-       disk_device, heads, sectors, cylinders,
+       cxt->dev_path, heads, sectors, cylinders,
        str_units(PLURAL), units_per_sector,
                        sector_size);
 }
< at >< at > -216,7 +216,7 < at >< at > sgi_list_table(int xtra) {
 printf(
 "%2d: %s %4s %9ld %9ld %9ld  %2x  %s\n",
 /* fdisk part number */   i+1,
-/* device */              partname(disk_device, kpi, w+2),
+/* device */              partname(cxt->dev_path, kpi, w+2),
 /* flags */               (sgi_get_swappartition() == i) ? "swap" :
 /* flags */               (sgi_get_bootpartition() == i) ? "boot" : "    ", 
 /* start */               (long) scround(start),
< at >< at > -357,9 +357,9 < at >< at > sgi_write_table(void) {
 sizeof(*sgilabel)));
 assert(two_s_complement_32bit_sum(
 (unsigned int*)sgilabel, sizeof(*sgilabel)) == 0);
-if (lseek(fd, 0, SEEK_SET) < 0)
+if (lseek(cxt->dev_fd, 0, SEEK_SET) < 0)
 fatal(unable_to_seek);
-if (write(fd, sgilabel, SECTOR_SIZE) != SECTOR_SIZE)
+if (write(cxt->dev_fd, sgilabel, SECTOR_SIZE) != SECTOR_SIZE)
 fatal(unable_to_write);
 if (! strncmp((char *) sgilabel->directory[0].vol_file_name, "sgilabel", 8)) {
 /*
< at >< at > -368,10 +368,10 < at >< at > sgi_write_table(void) {
  */
 sgiinfo *info = fill_sgiinfo();
 int infostartblock = SSWAP32(sgilabel->directory[0].vol_file_start);
-if (lseek(fd, (off_t) infostartblock*
+if (lseek(cxt->dev_fd, (off_t) infostartblock*
 SECTOR_SIZE, SEEK_SET) < 0)
 fatal(unable_to_seek);
-if (write(fd, info, SECTOR_SIZE) != SECTOR_SIZE)
+if (write(cxt->dev_fd, info, SECTOR_SIZE) != SECTOR_SIZE)
 fatal(unable_to_write);
 free(info);
 }
< at >< at > -702,11 +702,11 < at >< at > create_sgilabel(void)
 
 other_endian = (BYTE_ORDER == LITTLE_ENDIAN);
 
-res = blkdev_get_sectors(fd, &llsectors);
+res = blkdev_get_sectors(cxt->dev_fd, &llsectors);
 
 #ifdef HDIO_GETGEO
-if (ioctl(fd, HDIO_GETGEO, &geometry) < 0)
-err(EXIT_FAILURE, _("HDIO_GETGEO ioctl failed on %s"), disk_device);
+if (ioctl(cxt->dev_fd, HDIO_GETGEO, &geometry) < 0)
+err(EXIT_FAILURE, _("HDIO_GETGEO ioctl failed on %s"), cxt->dev_path);
 
 heads = geometry.heads;
 sectors = geometry.sectors;
< at >< at > -724,7 +724,7 < at >< at > create_sgilabel(void)
 _("Warning:  BLKGETSIZE ioctl failed on %s.  "
   "Using geometry cylinder value of %d.\n"
   "This value may be truncated for devices"
-  " > 33.8 GB.\n"), disk_device, cylinders);
+  " > 33.8 GB.\n"), cxt->dev_path, cylinders);
 }
 #endif
 for (i = 0; i < 4; i++) {
diff --git a/fdisk/fdisksunlabel.c b/fdisk/fdisksunlabel.c
index 4a6db35..6944824 100644
--- a/fdisk/fdisksunlabel.c
+++ b/fdisk/fdisksunlabel.c
< at >< at > -172,11 +172,11 < at >< at > void create_sunlabel(void)
 sunlabel->version = SSWAP32(SUN_LABEL_VERSION);
 sunlabel->num_partitions = SSWAP16(SUN_NUM_PARTITIONS);
 
-res = blkdev_get_sectors(fd, &llsectors);
+res = blkdev_get_sectors(cxt->dev_fd, &llsectors);
 sec_fac = sector_size / 512;
 
 #ifdef HDIO_GETGEO
-if (!ioctl(fd, HDIO_GETGEO, &geometry)) {
+if (!ioctl(cxt->dev_fd, HDIO_GETGEO, &geometry)) {
         heads = geometry.heads;
         sectors = geometry.sectors;
 if (res == 0) {
< at >< at > -190,7 +190,7 < at >< at > void create_sunlabel(void)
 _("Warning:  BLKGETSIZE ioctl failed on %s.  "
   "Using geometry cylinder value of %d.\n"
   "This value may be truncated for devices"
-  " > 33.8 GB.\n"), disk_device, cylinders);
+  " > 33.8 GB.\n"), cxt->dev_path, cylinders);
 }
 } else
 #endif
< at >< at > -538,7 +538,7 < at >< at > void sun_list_table(int xtra)
 int i, w;
 char *type;
 
-w = strlen(disk_device);
+w = strlen(cxt->dev_path);
 if (xtra)
 printf(
 _("\nDisk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
< at >< at > -547,7 +547,7 < at >< at > void sun_list_table(int xtra)
 "Label ID: %s\n"
 "Volume ID: %s\n"
 "Units = %s of %d * 512 bytes\n\n"),
-       disk_device, heads, sectors, SSWAP16(sunlabel->rpm),
+       cxt->dev_path, heads, sectors, SSWAP16(sunlabel->rpm),
        cylinders, SSWAP16(sunlabel->acyl),
        SSWAP16(sunlabel->pcyl),
        SSWAP16(sunlabel->apc),
< at >< at > -559,7 +559,7 < at >< at > void sun_list_table(int xtra)
 printf(
 _("\nDisk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n\n"),
-       disk_device, heads, sectors, cylinders,
+       cxt->dev_path, heads, sectors, cylinders,
        str_units(PLURAL), units_per_sector);
 
 printf(_("%*s Flag    Start       End    Blocks   Id  System\n"),
< at >< at > -573,7 +573,7 < at >< at > void sun_list_table(int xtra)
 uint32_t len = SSWAP32(part->num_sectors);
 printf(
     "%s %c%c %9lu %9lu %9lu%c  %2x  %s\n",
-/* device */  partname(disk_device, i+1, w),
+/* device */  partname(cxt->dev_path, i+1, w),
 /* flags */  (tag->flag & SSWAP16(SUN_FLAG_UNMNT)) ? 'u' : ' ',
   (tag->flag & SSWAP16(SUN_FLAG_RONLY)) ? 'r' : ' ',
 /* start */  (unsigned long) scround(start),
< at >< at > -634,9 +634,9 < at >< at > void sun_write_table(void)
 while(ush < (unsigned short *)(&sunlabel->cksum))
 csum ^= *ush++;
 sunlabel->cksum = csum;
-if (lseek(fd, 0, SEEK_SET) < 0)
+if (lseek(cxt->dev_fd, 0, SEEK_SET) < 0)
 fatal(unable_to_seek);
-if (write(fd, sunlabel, SECTOR_SIZE) != SECTOR_SIZE)
+if (write(cxt->dev_fd, sunlabel, SECTOR_SIZE) != SECTOR_SIZE)
 fatal(unable_to_write);
 }
 
diff --git a/fdisk/utils.c b/fdisk/utils.c
new file mode 100644
index 0000000..ad83d7f
--- /dev/null
+++ b/fdisk/utils.c
< at >< at > -0,0 +1,71 < at >< at >
+/*
+ *  Copyright (C) 2012 Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "common.h"
+#include "fdisk.h"
+
+/**
+ * fdisk_new_context:
+ *
+ * Returns: newly allocated fdisk context
+ */
+struct fdisk_context *fdisk_new_context_from_filename(const char *fname)
+{
+int fd;
+struct fdisk_context *cxt = NULL;
+
+/*
+ * Attempt to open the device with r-w permissions
+ * by default, otherwise try read-only.
+ */
+if ((fd = open(fname, O_RDWR)) < 0)
+if ((fd = open(fname, O_RDONLY)) < 0)
+goto ret;
+
+cxt = calloc(1, sizeof(*cxt));
+if (!cxt)
+goto ret;
+
+cxt->dev_fd = fd;
+cxt->dev_path = strdup(fname);
+if (!cxt->dev_path)
+return NULL;
+ret:
+return cxt;
+}
+
+/**
+ * fdisk_free_context:
+ * < at >cxt: fdisk context
+ *
+ * Deallocates context struct.
+ */
+void fdisk_free_context(struct fdisk_context *cxt)
+{
+if (!cxt)
+return;
+
+close(cxt->dev_fd);
+free(cxt->dev_path);
+free(cxt);
+}
+

[PATCH 6/6] fdisk: add debug support

Davidlohr Bueso — 2012-05-20T16:11:39

From: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>

Based on libmnt, this patch adds basic debugging support for fdisk. Currently only CONTEXT is debugged, yet keeps exact functionality
as libmnt/libblkid.

Signed-off-by: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>
---
 fdisk/fdisk.c |    2 ++
 fdisk/fdisk.h |   27 +++++++++++++++++++++++++++
 fdisk/utils.c |   33 ++++++++++++++++++++++++++++++++-
 3 files changed, 61 insertions(+), 1 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 400e682..9b91fa0 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
< at >< at > -2168,6 +2168,8 < at >< at > int main(int argc, char **argv)
 }
 }
 
+fdisk_init_debug(0);
+
 if (user_set_sector_size && argc-optind != 1)
 printf(_("Warning: the -b (set sector size) option should"
  " be used with one specified device\n"));
diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index c43517c..2471541 100644
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
< at >< at > -32,6 +32,33 < at >< at >
 #define cround(n)(display_in_cyl_units ? ((n)/units_per_sector)+1 : (n))
 #define scround(x)(((x)+units_per_sector-1)/units_per_sector)
 
+/* fdisk debugging flags/options */
+#define FDISK_DEBUG_INIT(1 << 1)
+#define FDISK_DEBUG_CONTEXT(1 << 2)
+#define FDISK_DEBUG_ALL0xFFFF
+
+# define ON_DBG(m, x)do { \
+if ((FDISK_DEBUG_ ## m) & fdisk_debug_mask) { \
+x; \
+}   \
+} while (0)
+
+# define DBG(m, x)do { \
+if ((FDISK_DEBUG_ ## m) & fdisk_debug_mask) { \
+fprintf(stderr, "%d: fdisk: %8s: ", getpid(), # m); \
+x;\
+} \
+} while (0)
+
+# define DBG_FLUSHdo { \
+if (fdisk_debug_mask && \
+    fdisk_debug_mask != FDISK_DEBUG_INIT) \
+fflush(stderr);\
+} while(0)
+
+extern int fdisk_debug_mask;
+extern void fdisk_init_debug(int mask);
+
 struct partition {
 unsigned char boot_ind;         /* 0x80 - active */
 unsigned char head;             /* starting head */
diff --git a/fdisk/utils.c b/fdisk/utils.c
index ad83d7f..9f071a6 100644
--- a/fdisk/utils.c
+++ b/fdisk/utils.c
< at >< at > -23,6 +23,35 < at >< at >
 #include "common.h"
 #include "fdisk.h"
 
+int fdisk_debug_mask;
+
+/**
+ * fdisk_init_debug:
+ * < at >mask: debug mask (0xffff to enable full debuging)
+ *
+ * If the < at >mask is not specified then this function reads
+ * FDISK_DEBUG environment variable to get the mask.
+ *
+ * Already initialized debugging stuff cannot be changed. It does not
+ * have effect to call this function twice.
+ */
+void fdisk_init_debug(int mask)
+{
+if (fdisk_debug_mask & FDISK_DEBUG_INIT)
+return;
+if (!mask) {
+char *str = getenv("FDISK_DEBUG");
+if (str)
+fdisk_debug_mask = strtoul(str, 0, 0);
+} else
+fdisk_debug_mask = mask;
+
+if (fdisk_debug_mask)
+printf("fdisk: debug mask set to 0x%04x.\n",
+       fdisk_debug_mask);
+fdisk_debug_mask |= FDISK_DEBUG_INIT;
+}
+
 /**
  * fdisk_new_context:
  *
< at >< at > -37,9 +66,11 < at >< at > struct fdisk_context *fdisk_new_context_from_filename(const char *fname)
  * Attempt to open the device with r-w permissions
  * by default, otherwise try read-only.
  */
-if ((fd = open(fname, O_RDWR)) < 0)
+if ((fd = open(fname, O_RDWR)) < 0) {
 if ((fd = open(fname, O_RDONLY)) < 0)
 goto ret;
+DBG(CONTEXT, printf("opened %s as read-only\n", fname));
+}
 
 cxt = calloc(1, sizeof(*cxt));
 if (!cxt)

[PATCH 4/6] fdisk: use BSD label header

Davidlohr Bueso — 2012-05-20T16:11:33

From: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>

Move bsd specific function definitions into its own header file and include it in fdisk code.

Signed-off-by: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>
---
 fdisk/fdisk.c         |    1 +
 fdisk/fdisk.h         |    6 ------
 fdisk/fdiskbsdlabel.h |    5 +++++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 08afb45..b6c5758 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
< at >< at > -39,6 +39,7 < at >< at >
 #include "fdiskaixlabel.h"
 #include "fdiskmaclabel.h"
 #include "fdiskdoslabel.h"
+#include "fdiskbsdlabel.h"
 
 #ifdef HAVE_LINUX_COMPILER_H
 #include <linux/compiler.h>
diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index 0dafbf8..82888dc 100644
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
< at >< at > -185,9 +185,3 < at >< at > static inline int is_cleared_partition(struct partition *p)
  p->sys_ind || p->end_head || p->end_sector || p->end_cyl ||
  get_start_sect(p) || get_nr_sects(p));
 }
-
-/* prototypes for fdiskbsdlabel.c */
-extern void bsd_command_prompt(void);
-extern int check_osf_label(void);
-extern int btrydev(char * dev);
-extern void xbsd_print_disklabel(int);
diff --git a/fdisk/fdiskbsdlabel.h b/fdisk/fdiskbsdlabel.h
index e58e2ff..9bea7cf 100644
--- a/fdisk/fdiskbsdlabel.h
+++ b/fdisk/fdiskbsdlabel.h
< at >< at > -238,4 +238,9 < at >< at > static struct systypes xbsd_fstypes[] = {
 #defineBSD_D_CHAIN    0x10/* can do back-back transfers */
 #defineBSD_D_DOSPART0x20/* within MSDOS partition */
 
+extern void bsd_command_prompt(void);
+extern int check_osf_label(void);
+extern int btrydev(char * dev);
+extern void xbsd_print_disklabel(int);
+
 #endif /* FDISK_BSD_LABEL_H */

[PATCH 3/6] fdisk: refactor -s option

Davidlohr Bueso — 2012-05-20T16:11:29

From: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>

Signed-off-by: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>
---
 fdisk/fdisk.c |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 9387795..08afb45 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
< at >< at > -2095,10 +2095,22 < at >< at > static void command_prompt(void)
 }
 }
 
+static unsigned long long get_dev_sz(char *dev)
+{
+int fd;
+unsigned long long size;
+
+if ((fd = open(dev, O_RDONLY)) < 0)
+err(EXIT_FAILURE, _("unable to open %s"), dev);
+if (blkdev_get_sectors(fd, &size) == -1)
+fatal(ioctl_error);
+close(fd);
+return size/2;
+}
+
 int main(int argc, char **argv)
 {
-int j, c;
-int optl = 0, opts = 0;
+int c, optl = 0, opts = 0;
 
 setlocale(LC_ALL, "");
 bindtextdomain(PACKAGE, LOCALEDIR);
< at >< at > -2182,27 +2194,18 < at >< at > int main(int argc, char **argv)
 }
 
 if (opts) {
-unsigned long long size;
-
-nowarn = 1;
-
-opts = argc - optind;
-if (opts <= 0)
+/* print partition size for one or more devices */
+int i, ndevs = argc - optind;
+if (ndevs <= 0)
 usage(stderr);
 
-for (j = optind; j < argc; j++) {
-disk_device = argv[j];
-if ((fd = open(disk_device, O_RDONLY)) < 0)
-err(EXIT_FAILURE, _("unable to open %s"), disk_device);
-if (blkdev_get_sectors(fd, &size) == -1)
-fatal(ioctl_error);
-close(fd);
-if (opts == 1)
-printf("%llu\n", size/2);
+for (i = optind; i < argc; i++) {
+if (ndevs == 1)
+printf("%llu\n", get_dev_sz(argv[i]));
 else
-printf("%s: %llu\n", argv[j], size/2);
+printf("%s: %llu\n", argv[i], get_dev_sz(argv[i]));
 }
-exit(0);
+exit(EXIT_SUCCESS);
 }
 
 if (argc-optind == 1)

[PATCH 2/6] fdisk: remove bogus statement

Davidlohr Bueso — 2012-05-20T16:11:26

From: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>

usage() does not return, also move the help option handling to the bottom of the switch.

Signed-off-by: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>
---
 fdisk/fdisk.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 2f3c119..9387795 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
< at >< at > -2095,8 +2095,8 < at >< at > static void command_prompt(void)
 }
 }
 
-int
-main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
 int j, c;
 int optl = 0, opts = 0;
 
< at >< at > -2130,9 +2130,6 < at >< at > main(int argc, char **argv) {
 else if (optarg && strcmp(optarg, "=nondos"))
 usage(stderr);
 break;
-case 'h':
-usage(stdout);
-break;
 case 'H':
 user_heads = strtou32_or_err(optarg, _("invalid heads argument"));
 if (user_heads > 256)
< at >< at > -2160,6 +2157,8 < at >< at > main(int argc, char **argv) {
 case 'v':
 printf(UTIL_LINUX_VERSION);
 return EXIT_SUCCESS;
+case 'h':
+usage(stdout);
 default:
 usage(stderr);
 }

[PATCH 1/6] fdisk: add an quit/exit handling function

Davidlohr Bueso — 2012-05-20T16:11:21

From: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>

Signed-off-by: Davidlohr Bueso <dave-mXXj517/zsQ< at >public.gmane.org>
---
 fdisk/fdisk.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 3f83297..2f3c119 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
< at >< at > -1810,6 +1810,13 < at >< at > move_begin(int i) {
 }
 }
 
+static void __attribute__ ((__noreturn__)) handle_quit(void)
+{
+close(fd);
+printf("\n");
+exit(EXIT_SUCCESS);
+}
+
 static void
 expert_command_prompt(void)
 {
< at >< at > -1875,9 +1882,7 < at >< at > expert_command_prompt(void)
 x_list_table(0);
 break;
 case 'q':
-close(fd);
-printf("\n");
-exit(0);
+handle_quit();
 case 'r':
 return;
 case 's':
< at >< at > -2064,9 +2069,7 < at >< at > static void command_prompt(void)
 list_table(0);
 break;
 case 'q':
-close(fd);
-printf("\n");
-exit(0);
+handle_quit();
 case 's':
 create_sunlabel();
 break;

[PATCH 1/3] findmnt: reference correct manual section

Dave Reisner — 2012-05-20T00:39:19

Signed-off-by: Dave Reisner <dreisner-fd97jBR+K/6hPH1hqNUYSQ< at >public.gmane.org>
---
 misc-utils/findmnt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 1d34696..9005483 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
< at >< at > -1005,7 +1005,7 < at >< at > static void __attribute__((__noreturn__)) usage(FILE *out)
 for (i = 0; i < FINDMNT_NCOLUMNS; i++)
 fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-fprintf(out, USAGE_MAN_TAIL("findmnt(1)"));
+fprintf(out, USAGE_MAN_TAIL("findmnt(8)"));
 
 exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }

[PATCH 1/4] last: use min() from c.h

Petr Uzel — 2012-05-17T07:41:06

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 login-utils/last.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/login-utils/last.c b/login-utils/last.c
index 34558bb..62fc55c 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
< at >< at > -72,15 +72,11 < at >< at > static struct utmputmpbuf;
 #defineLMAX(int)sizeof(utmpbuf.ut_line)/* size of utmp tty field */
 #defineNMAX(int)sizeof(utmpbuf.ut_name)/* size of utmp name field */
 
-#ifndef MIN
-#define MIN(a,b)(((a) < (b)) ? (a) : (b))
-#endif

[PATCH 1/2] blkid: use symbolic exit code

Petr Uzel — 2012-05-16T08:38:31

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 misc-utils/blkid.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 8007840..4f7050f 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
< at >< at > -720,7 +720,7 < at >< at > int main(int argc, char **argv)
 
 while (blkid_superblocks_get_name(idx++, &name, NULL) == 0)
 printf("%s\n", name);
-exit(0);
+exit(EXIT_SUCCESS);
 }
 case 'o':
 if (!strcmp(optarg, "value"))

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

Petr Uzel — 2012-05-15T08:49:01

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 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
< at >< at > -109,7 +109,7 < at >< at >
 #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
< at >< at > -84,7 +84,7 < at >< at >
 #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
< at >< at > -54,7 +54,7 < at >< at >
 #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
< at >< at > -27,7 +27,7 < at >< at >
 
 #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
< at >< at > -1,6 +1,7 < at >< at >
 include $(top_srcdir)/config/include-Makefile.am
 
 dist_noinst_HEADERS = \
+all-io.h \
 at.h \
 bitops.h \
 blkdev.h \
< at >< at > -40,6 +41,5 < at >< at > 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
< at >< at > -0,0 +1,47 < at >< at >
+#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
< at >< at > -1,47 +0,0 < at >< at >
-#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
< at >< at > -27,7 +27,7 < at >< at >
 #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
< at >< at > -109,7 +109,7 < at >< at >
 #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
< at >< at > -66,7 +66,7 < at >< at >
 #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
< at >< at > -33,7 +33,7 < at >< at > 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
< at >< at > -35,7 +35,7 < at >< at >
 #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
< at >< at > -27,7 +27,7 < at >< at >
 #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
< at >< at > -33,7 +33,7 < at >< at >
 #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
< at >< at > -62,7 +62,7 < at >< at >
 #include "nls.h"
 #include "xalloc.h"
 #include "widechar.h"
-#include "writeall.h"
+#include "all-io.h"
 #include "closestream.h"
 
 #defineREADBUFLINE_MAX/* size of input buffer */

[PATCH 1/2] lib/tt: make get_terminal_width available externally

Petr Uzel — 2012-05-14T07:51:57

Also, rename get_terminal_width() to tt_get_terminal_width()
to match naming convention of other exported functions.

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 include/tt.h |    1 +
 lib/tt.c     |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/tt.h b/include/tt.h
index 36d3bb2..9aa04db 100644
--- a/include/tt.h
+++ b/include/tt.h
< at >< at > -86,5 +86,6 < at >< at > extern struct tt_line *tt_add_line(struct tt *tb, struct tt_line *parent);
 
 extern int tt_line_set_data(struct tt_line *ln, int colnum, const char *data);
 extern int tt_line_set_userdata(struct tt_line *ln, void *data);
+extern int tt_get_terminal_width(void);
 
 #endif /* UTIL_LINUX_TT_H */
diff --git a/lib/tt.c b/lib/tt.c
index 1b5fbac..af3a34e 100644
--- a/lib/tt.c
+++ b/lib/tt.c
< at >< at > -253,7 +253,7 < at >< at > int tt_line_set_data(struct tt_line *ln, int colnum, const char *data)
 return 0;
 }
 
-static int get_terminal_width(void)
+int tt_get_terminal_width(void)
 {
 #ifdef TIOCGSIZE
 struct ttysizet_win;
< at >< at > -750,7 +750,7 < at >< at > int tt_print_table(struct tt *tb)
 return -1;
 
 if (tb->first_run && !tb->termwidth) {
-tb->termwidth = get_terminal_width();
+tb->termwidth = tt_get_terminal_width();
 if (tb->termwidth <= 0)
 tb->termwidth = 80;
 }

[PATCH] mangle: check for end of string on every iteration

Dave Reisner — 2012-05-13T19:14:49

Checking for the null byte at the end of the string only conditionally
leads to segfaults, evidenced by mount helpers crashing on writes to
/run/mount/utab. Simply check for the null on each iteration, and append
a null byte to the mangled string before breaking.

Signed-off-by: Dave Reisner <dreisner-fd97jBR+K/6hPH1hqNUYSQ< at >public.gmane.org>
---
 lib/mangle.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/mangle.c b/lib/mangle.c
index e1b4814..656918c 100644
--- a/lib/mangle.c
+++ b/lib/mangle.c
< at >< at > -31,16 +31,17 < at >< at > char *mangle(const char *s)
 if (!sp)
 return NULL;
 while(1) {
+if (!*s) {
+*sp = '\0';
+break;
+}
 if (is_unwanted_char(*s)) {
 *sp++ = '\\';
 *sp++ = '0' + ((*s & 0300) >> 6);
 *sp++ = '0' + ((*s & 070) >> 3);
 *sp++ = '0' + (*s & 07);
-} else {
+} else
 *sp++ = *s;
-if (!*s)
-break;
-}
 s++;
 }
 return ss;

[PATCH] rev.1: mention tac(1) in 'SEE ALSO' section

Petr Uzel — 2012-05-13T11:57:46

Cc: James R. Van Zandt" <jrv-8fiUuRrzOP0dnm+yROfE0A< at >public.gmane.org>
From: James R. Van Zandt" <jrv-8fiUuRrzOP0dnm+yROfE0A< at >public.gmane.org>
Addresses: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568709

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 text-utils/rev.1 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/text-utils/rev.1 b/text-utils/rev.1
index 5917747..b9b5f48 100644
--- a/text-utils/rev.1
+++ b/text-utils/rev.1
< at >< at > -56,3 +56,5 < at >< at > The rev command is part of the util-linux package and is available from
 .UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
 Linux Kernel Archive
 .UE .
+.SH SEE ALSO
+.BR tac (1)

[PATCH 1/3] mkswap: use is_mounted() instead of check_mount()

Petr Uzel — 2012-05-13T11:44:30

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 disk-utils/Makefile.am |    1 +
 disk-utils/mkswap.c    |   26 ++------------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 09dfa99..ecff70e 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
< at >< at > -47,6 +47,7 < at >< at > swaplabel_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
 
 mkswap_SOURCES = \
 mkswap.c \
+$(top_srcdir)/lib/ismounted.c \
 $(top_srcdir)/lib/strutils.c \
 $(top_srcdir)/lib/wholedisk.c \
 $(utils_common)
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 51a0c89..c7dedd7 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
< at >< at > -58,6 +58,7 < at >< at >
 #include "xalloc.h"
 #include "c.h"
 #include "closestream.h"
+#include "ismounted.h"
 
 #ifdef HAVE_LIBUUID
 # include <uuid.h>
< at >< at > -348,29 +349,6 < at >< at > get_size(const char *file)
 return size;
 }
 
-/*
- * Check to make certain that our new filesystem won't be created on
- * an already mounted partition.  Code adapted from mke2fs, Copyright
- * (C) 1994 Theodore Ts'o.  Also licensed under GPL.
- * (C) 2006 Karel Zak -- port to mkswap
- */
-static int
-check_mount(void)
-{
-FILE *f;
-struct mntent *mnt;
-
-if ((f = setmntent (_PATH_MOUNTED, "r")) == NULL)
-return 0;
-while ((mnt = getmntent (f)) != NULL)
-if (strcmp (device_name, mnt->mnt_fsname) == 0)
-break;
-endmntent (f);
-if (!mnt)
-return 0;
-return 1;
-}

[PATCH] lsblk.8: improve wording

Petr Uzel — 2012-05-13T09:08:20

Cc: Regid Ichira <regid23-/E1597aS9LQAvxtiuMwx3w< at >public.gmane.org>
From: Regid Ichira <regid23-/E1597aS9LQAvxtiuMwx3w< at >public.gmane.org>
Addresses: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672702

Signed-off-by: Petr Uzel <petr.uzel-AlSwsSmVLrQ< at >public.gmane.org>
---
 misc-utils/lsblk.8 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc-utils/lsblk.8 b/misc-utils/lsblk.8
index 21d5838..79173da 100644
--- a/misc-utils/lsblk.8
+++ b/misc-utils/lsblk.8
< at >< at > -66,8 +66,8 < at >< at > This option is equivalent to "-o NAME,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,RO
 .IP "\fB\-V, \-\-version\fP"
 Output version information and exit.
 .SH NOTES
-For the partitions are some information (e.g. queue attributes) inherited from
-parental device.
+For partitions, some information (e.g. queue attributes) is inherited from the
+parent device.
 
 The
 .B lsblk