summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/dmesg.c4
-rw-r--r--util-linux/fdisk.c30
-rw-r--r--util-linux/hexdump.c4
-rw-r--r--util-linux/mdev.c6
-rw-r--r--util-linux/mkswap.c2
-rw-r--r--util-linux/mount.c6
-rw-r--r--util-linux/umount.c2
7 files changed, 27 insertions, 27 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 34519dfd1..c8b3aeeab 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -1,6 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * 3 *
4 * dmesg - display/control kernel ring buffer. 4 * dmesg - display/control kernel ring buffer.
5 * 5 *
6 * Copyright 2006 Rob Landley <rob@landley.net> 6 * Copyright 2006 Rob Landley <rob@landley.net>
@@ -30,7 +30,7 @@ int dmesg_main(int argc, char *argv[])
30 if (0 > (len = klogctl(3 + (flags & 1), buf, len))) 30 if (0 > (len = klogctl(3 + (flags & 1), buf, len)))
31 bb_perror_msg_and_die("klogctl"); 31 bb_perror_msg_and_die("klogctl");
32 32
33 // Skip <#> at the start of lines, and make sure we end with a newline. 33 // Skip <#> at the start of lines, and make sure we end with a newline.
34 34
35 if (ENABLE_FEATURE_DMESG_PRETTY) { 35 if (ENABLE_FEATURE_DMESG_PRETTY) {
36 int last = '\n'; 36 int last = '\n';
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 8c7225816..55f716657 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -1914,9 +1914,9 @@ sgi_set_swappartition(int i)
1914static int 1914static int
1915sgi_check_bootfile(const char* aFile) 1915sgi_check_bootfile(const char* aFile)
1916{ 1916{
1917 if (strlen(aFile) < 3) /* "/a\n" is minimum */ { 1917 if (strlen(aFile) < 3) /* "/a\n" is minimum */ {
1918 printf(_("\nInvalid Bootfile!\n" 1918 printf(_("\nInvalid Bootfile!\n"
1919 "\tThe bootfile must be an absolute non-zero pathname,\n" 1919 "\tThe bootfile must be an absolute non-zero pathname,\n"
1920 "\te.g. \"/unix\" or \"/unix.save\".\n")); 1920 "\te.g. \"/unix\" or \"/unix.save\".\n"));
1921 return 0; 1921 return 0;
1922 } else { 1922 } else {
@@ -1931,7 +1931,7 @@ sgi_check_bootfile(const char* aFile)
1931 return 0; 1931 return 0;
1932 } 1932 }
1933 } 1933 }
1934 } 1934 }
1935 if (strncmp(aFile, (char*)sgilabel->boot_file, 16)) { 1935 if (strncmp(aFile, (char*)sgilabel->boot_file, 16)) {
1936 printf(_("\n\tBe aware, that the bootfile is not checked for existence.\n\t" 1936 printf(_("\n\tBe aware, that the bootfile is not checked for existence.\n\t"
1937 "SGI's default is \"/unix\" and for backup \"/unix.save\".\n")); 1937 "SGI's default is \"/unix\" and for backup \"/unix.save\".\n"));
@@ -2505,7 +2505,7 @@ static const struct systypes sun_sys_types[] = {
2505 { "\x83" "Linux native" }, /* LINUX_NATIVE */ 2505 { "\x83" "Linux native" }, /* LINUX_NATIVE */
2506 { "\x8e" "Linux LVM" }, /* 0x8e */ 2506 { "\x8e" "Linux LVM" }, /* 0x8e */
2507/* New (2.2.x) raid partition with autodetect using persistent superblock */ 2507/* New (2.2.x) raid partition with autodetect using persistent superblock */
2508 { "\xfd" "Linux raid autodetect" }, /* 0xfd */ 2508 { "\xfd" "Linux raid autodetect" }, /* 0xfd */
2509 { NULL } 2509 { NULL }
2510}; 2510};
2511 2511
@@ -3080,14 +3080,14 @@ sun_list_table(int xtra)
3080 uint32_t start = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors; 3080 uint32_t start = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors;
3081 uint32_t len = SUN_SSWAP32(sunlabel->partitions[i].num_sectors); 3081 uint32_t len = SUN_SSWAP32(sunlabel->partitions[i].num_sectors);
3082 printf("%s %c%c %9ld %9ld %9ld%c %2x %s\n", 3082 printf("%s %c%c %9ld %9ld %9ld%c %2x %s\n",
3083 partname(disk_device, i+1, w), /* device */ 3083 partname(disk_device, i+1, w), /* device */
3084 (sunlabel->infos[i].flags & 0x01) ? 'u' : ' ', /* flags */ 3084 (sunlabel->infos[i].flags & 0x01) ? 'u' : ' ', /* flags */
3085 (sunlabel->infos[i].flags & 0x10) ? 'r' : ' ', 3085 (sunlabel->infos[i].flags & 0x10) ? 'r' : ' ',
3086 (long) scround(start), /* start */ 3086 (long) scround(start), /* start */
3087 (long) scround(start+len), /* end */ 3087 (long) scround(start+len), /* end */
3088 (long) len / 2, len & 1 ? '+' : ' ', /* odd flag on end */ 3088 (long) len / 2, len & 1 ? '+' : ' ', /* odd flag on end */
3089 sunlabel->infos[i].id, /* type id */ 3089 sunlabel->infos[i].id, /* type id */
3090 partition_type(sunlabel->infos[i].id)); /* type name */ 3090 partition_type(sunlabel->infos[i].id)); /* type name */
3091 } 3091 }
3092 } 3092 }
3093} 3093}
@@ -4280,8 +4280,8 @@ get_partition(int warn, int max)
4280 if (warn) { 4280 if (warn) {
4281 if ( 4281 if (
4282 ( 4282 (
4283 label_sun != current_label_type && 4283 label_sun != current_label_type &&
4284 label_sgi != current_label_type && 4284 label_sgi != current_label_type &&
4285 !pe->part_table->sys_ind 4285 !pe->part_table->sys_ind
4286 ) 4286 )
4287#ifdef CONFIG_FEATURE_SUN_LABEL 4287#ifdef CONFIG_FEATURE_SUN_LABEL
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 136243122..c2d79da5b 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -66,9 +66,9 @@ int hexdump_main(int argc, char **argv)
66 bb_dump_add(add_first); 66 bb_dump_add(add_first);
67 bb_dump_add(add_strings[(int)(p - hexdump_opts)]); 67 bb_dump_add(add_strings[(int)(p - hexdump_opts)]);
68 } else if (ch == 'C') { 68 } else if (ch == 'C') {
69 bb_dump_add("\"%08.8_Ax\n\""); 69 bb_dump_add("\"%08.8_Ax\n\"");
70 bb_dump_add("\"%08.8_ax \" 8/1 \"%02x \" \" \" 8/1 \"%02x \" "); 70 bb_dump_add("\"%08.8_ax \" 8/1 \"%02x \" \" \" 8/1 \"%02x \" ");
71 bb_dump_add("\" |\" 16/1 \"%_p\" \"|\\n\""); 71 bb_dump_add("\" |\" 16/1 \"%_p\" \"|\\n\"");
72 } else { 72 } else {
73 /* Sae a little bit of space below by omitting the 'else's. */ 73 /* Sae a little bit of space below by omitting the 'else's. */
74 if (ch == 'e') { 74 if (ch == 'e') {
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index b6ca00409..da4930f27 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -138,7 +138,7 @@ static void make_device(char *path, int delete)
138 // Command to run 138 // Command to run
139 char *s = "@$*", *s2; 139 char *s = "@$*", *s2;
140 if (!(s2 = strchr(s, *pos++))) { 140 if (!(s2 = strchr(s, *pos++))) {
141 // Force error 141 // Force error
142 field = 1; 142 field = 1;
143 break; 143 break;
144 } 144 }
@@ -171,13 +171,13 @@ static void make_device(char *path, int delete)
171 171
172 if (major == bbg.root_major && minor == bbg.root_minor) 172 if (major == bbg.root_major && minor == bbg.root_minor)
173 symlink(device_name, "root"); 173 symlink(device_name, "root");
174 174
175 if (ENABLE_FEATURE_MDEV_CONF) chown(device_name, uid, gid); 175 if (ENABLE_FEATURE_MDEV_CONF) chown(device_name, uid, gid);
176 } 176 }
177 if (command) { 177 if (command) {
178 int rc; 178 int rc;
179 char *s; 179 char *s;
180 180
181 s=xasprintf("MDEV=%s",device_name); 181 s=xasprintf("MDEV=%s",device_name);
182 putenv(s); 182 putenv(s);
183 rc = system(command); 183 rc = system(command);
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index b109f5ce1..8c307ec43 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -19,7 +19,7 @@ int mkswap_main(int argc, char *argv[])
19 if (argc!=2) bb_show_usage(); 19 if (argc!=2) bb_show_usage();
20 20
21 // Figure out how big the device is and announce our intentions. 21 // Figure out how big the device is and announce our intentions.
22 22
23 fd = xopen(argv[1],O_RDWR); 23 fd = xopen(argv[1],O_RDWR);
24 len = fdlength(fd); 24 len = fdlength(fd);
25 pagesize = getpagesize(); 25 pagesize = getpagesize();
diff --git a/util-linux/mount.c b/util-linux/mount.c
index ea96fb5b0..6176de3a1 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -673,7 +673,7 @@ get_mountport(struct sockaddr_in *server_addr,
673 p.pm_vers = version; 673 p.pm_vers = version;
674 p.pm_prot = proto; 674 p.pm_prot = proto;
675 p.pm_port = port; 675 p.pm_port = port;
676 676
677 while (pmap) { 677 while (pmap) {
678 if (pmap->pml_map.pm_prog != prog) 678 if (pmap->pml_map.pm_prog != prog)
679 goto next; 679 goto next;
@@ -1315,7 +1315,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
1315 s = strrchr(mp->mnt_fsname, '\\'); 1315 s = strrchr(mp->mnt_fsname, '\\');
1316 if (s == mp->mnt_fsname+1) goto report_error; 1316 if (s == mp->mnt_fsname+1) goto report_error;
1317 *s = 0; 1317 *s = 0;
1318 he = gethostbyname(mp->mnt_fsname+2); 1318 he = gethostbyname(mp->mnt_fsname+2);
1319 *s = '\\'; 1319 *s = '\\';
1320 if (!he) goto report_error; 1320 if (!he) goto report_error;
1321 1321
@@ -1517,7 +1517,7 @@ int mount_main(int argc, char **argv)
1517 if (rc) bb_perror_msg_and_die("%s", argv[0]); 1517 if (rc) bb_perror_msg_and_die("%s", argv[0]);
1518 goto clean_up; 1518 goto clean_up;
1519 } 1519 }
1520 1520
1521 // Open either fstab or mtab 1521 // Open either fstab or mtab
1522 1522
1523 if (parse_mount_options(cmdopts,0) & MS_REMOUNT) 1523 if (parse_mount_options(cmdopts,0) & MS_REMOUNT)
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 1a6b14ccc..f19586a0d 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -76,7 +76,7 @@ int umount_main(int argc, char **argv)
76 m = 0; 76 m = 0;
77 if (!argc) bb_show_usage(); 77 if (!argc) bb_show_usage();
78 } 78 }
79 79
80 // Loop through everything we're supposed to umount, and do so. 80 // Loop through everything we're supposed to umount, and do so.
81 for (;;) { 81 for (;;) {
82 int curstat; 82 int curstat;
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-19 03:23:01 +0000