sfdisk: avoid unneeded empty lines with '--list-free'
PATCH 1/1 sfdisk: avoid unneeded empty lines with '--list-free'
Similar to commit 4a52959d1 ("(s)fdisk: avoid unneeded empty lines with '--list'"), there were also two superfluous empty lines when /dev/sr0 didn't contain a medium. Refactor the '--list-free' code the same way as in the mentioned commit.
Signed-off-by Wolfram Sang <[email protected]>
--- disk-utils/fdisk-list.c | 14 ++++++++------ disk-utils/fdisk-list.h | 2 +- disk-utils/sfdisk.c | 10 +++------- 3 files changed, 12 insertions(+), 14 deletions(-)
disk-utils/fdisk-list.c +8 -6
@@ -383,7 +383,8 @@ int print_device_pt(struct fdisk_context *cxt, char *device, int warnme,return 0 ; } -int print_device_freespace (struct fdisk_context *cxt,char *device,int warnme) +int print_device_freespace (struct fdisk_context *cxt,char *device,int warnme, +int seperator) {if (fdisk_assign_device (cxt, device,1 ) !=0 ) {/* read-only */ if (warnme || errno ==EACCES )
@@ -391,6 +392,9 @@ int print_device_freespace(struct fdisk_context *cxt, char *device, int warnme)return -1 ; } +if (seperator) +fputs ("\n\n" , stdout); +list_freespace (cxt);fdisk_deassign_device (cxt,1 );return 0 ;
@@ -412,15 +416,13 @@ void print_all_devices_pt(struct fdisk_context *cxt, int verify)void print_all_devices_freespace (struct fdisk_context *cxt) {FILE *f =NULL ; -int ct =0 ; +int sep =0 ;char *dev;while ((dev =next_proc_partition (&f))) { -if (ct) -fputs ("\n\n" , stdout); -if (print_device_freespace (cxt, dev,0 ) ==0 ) - ct++; +print_device_freespace (cxt, dev,0 , sep);free (dev); + sep =1 ; } }
disk-utils/fdisk-list.h +1 -1
@@ -8,7 +8,7 @@ extern void list_freespace(struct fdisk_context *cxt);extern char *next_proc_partition (FILE **f);extern int print_device_pt (struct fdisk_context *cxt,char *device,int warnme,int verify,int seperator); -extern int print_device_freespace (struct fdisk_context *cxt,char *device,int warnme); +extern int print_device_freespace (struct fdisk_context *cxt,char *device,int warnme,int seperator);extern void print_all_devices_pt (struct fdisk_context *cxt,int verify);extern void print_all_devices_freespace (struct fdisk_context *cxt);
disk-utils/sfdisk.c +3 -7
@@ -673,15 +673,11 @@ static int command_list_freespace(struct sfdisk *sf, int argc, char **argv)fdisk_enable_listonly (sf->cxt,1 );if (argc) { -int i, ct =0 ; +int i; -for (i =0 ; i < argc; i++) { -if (ct) -fputs ("\n\n" , stdout); -if (print_device_freespace (sf->cxt, argv[i],1 ) !=0 ) +for (i =0 ; i < argc; i++) +if (print_device_freespace (sf->cxt, argv[i],1 , i) !=0 ) fail++; - ct++; - } }else print_all_devices_freespace (sf->cxt);
Signature · 1 line
2.26.2
Quoted 4 lines · Wolfram Sang
disk-utils/fdisk-list.c | 14 ++++++++------ disk-utils/fdisk-list.h | 2 +- disk-utils/sfdisk.c | 10 +++------- 3 files changed, 12 insertions(+), 14 deletions(-)
Applied, thanks.
Signature · 2 lines
Karel Zak <[email protected]> http://karelzak.blogspot.com