aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-01-14 01:34:48 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2013-01-14 01:34:48 +0100
commit6967578728a3eef43b7b2be4080dafc1b87f528d (patch)
tree76b79c4c81ce8e5ad4e57df5119efecef810e673 /util-linux
parent52185155088d0910d29c7f4fdf5cb3eecaac8965 (diff)
downloadbusybox-w32-6967578728a3eef43b7b2be4080dafc1b87f528d.tar.gz
busybox-w32-6967578728a3eef43b7b2be4080dafc1b87f528d.tar.bz2
busybox-w32-6967578728a3eef43b7b2be4080dafc1b87f528d.zip
whitespace fixes. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/fdformat.c2
-rw-r--r--util-linux/fdisk.c2
-rw-r--r--util-linux/flock.c2
-rw-r--r--util-linux/ipcrm.c6
-rw-r--r--util-linux/ipcs.c254
-rw-r--r--util-linux/lspci.c6
-rw-r--r--util-linux/mount.c48
-rw-r--r--util-linux/readprofile.c16
-rw-r--r--util-linux/volume_id/linux_raid.c6
-rw-r--r--util-linux/volume_id/util.c2
10 files changed, 172 insertions, 172 deletions
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index 2f0854a30..b3e918fb0 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -116,7 +116,7 @@ int fdformat_main(int argc UNUSED_PARAM, char **argv)
116 /* Check backwards so we don't need a counter */ 116 /* Check backwards so we don't need a counter */
117 while (--read_bytes >= 0) { 117 while (--read_bytes >= 0) {
118 if (data[read_bytes] != FD_FILL_BYTE) { 118 if (data[read_bytes] != FD_FILL_BYTE) {
119 printf("bad data in cyl %d\nContinuing... ", cyl); 119 printf("bad data in cyl %d\nContinuing... ", cyl);
120 } 120 }
121 } 121 }
122 } 122 }
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index c0be15a3a..39eb27b47 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -3023,7 +3023,7 @@ int fdisk_main(int argc UNUSED_PARAM, char **argv)
3023 printf("\nThe current boot file is: %s\n", 3023 printf("\nThe current boot file is: %s\n",
3024 sgi_get_bootfile()); 3024 sgi_get_bootfile());
3025 if (read_maybe_empty("Please enter the name of the " 3025 if (read_maybe_empty("Please enter the name of the "
3026 "new boot file: ") == '\n') 3026 "new boot file: ") == '\n')
3027 printf("Boot file unchanged\n"); 3027 printf("Boot file unchanged\n");
3028 else 3028 else
3029 sgi_set_bootfile(line_ptr); 3029 sgi_set_bootfile(line_ptr);
diff --git a/util-linux/flock.c b/util-linux/flock.c
index e9be4eee9..05a747f72 100644
--- a/util-linux/flock.c
+++ b/util-linux/flock.c
@@ -45,7 +45,7 @@ int flock_main(int argc UNUSED_PARAM, char **argv)
45 if (argv[1]) { 45 if (argv[1]) {
46 fd = open(argv[0], O_RDONLY|O_NOCTTY|O_CREAT, 0666); 46 fd = open(argv[0], O_RDONLY|O_NOCTTY|O_CREAT, 0666);
47 if (fd < 0 && errno == EISDIR) 47 if (fd < 0 && errno == EISDIR)
48 fd = open(argv[0], O_RDONLY|O_NOCTTY); 48 fd = open(argv[0], O_RDONLY|O_NOCTTY);
49 if (fd < 0) 49 if (fd < 0)
50 bb_perror_msg_and_die("can't open '%s'", argv[0]); 50 bb_perror_msg_and_die("can't open '%s'", argv[0]);
51 //TODO? close_on_exec_on(fd); 51 //TODO? close_on_exec_on(fd);
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index 274050cdf..888f70ef8 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -160,7 +160,7 @@ int ipcrm_main(int argc, char **argv)
160 160
161 /* convert key to id */ 161 /* convert key to id */
162 id = ((c == 'q') ? msgget(key, 0) : 162 id = ((c == 'q') ? msgget(key, 0) :
163 (c == 'm') ? shmget(key, 0, 0) : semget(key, 0, 0)); 163 (c == 'm') ? shmget(key, 0, 0) : semget(key, 0, 0));
164 164
165 if (id < 0) { 165 if (id < 0) {
166 const char *errmsg; 166 const char *errmsg;
@@ -189,8 +189,8 @@ int ipcrm_main(int argc, char **argv)
189 } 189 }
190 190
191 result = ((c == 'q') ? msgctl(id, IPC_RMID, NULL) : 191 result = ((c == 'q') ? msgctl(id, IPC_RMID, NULL) :
192 (c == 'm') ? shmctl(id, IPC_RMID, NULL) : 192 (c == 'm') ? shmctl(id, IPC_RMID, NULL) :
193 semctl(id, 0, IPC_RMID, arg)); 193 semctl(id, 0, IPC_RMID, arg));
194 194
195 if (result) { 195 if (result) {
196 const char *errmsg; 196 const char *errmsg;
diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c
index ee7df5e33..8fdaf0b85 100644
--- a/util-linux/ipcs.c
+++ b/util-linux/ipcs.c
@@ -154,52 +154,52 @@ static NOINLINE void do_shm(void)
154 /* glibc 2.1.3 and all earlier libc's have ints as fields 154 /* glibc 2.1.3 and all earlier libc's have ints as fields
155 of struct shminfo; glibc 2.1.91 has unsigned long; ach */ 155 of struct shminfo; glibc 2.1.91 has unsigned long; ach */
156 printf("max number of segments = %lu\n" 156 printf("max number of segments = %lu\n"
157 "max seg size (kbytes) = %lu\n" 157 "max seg size (kbytes) = %lu\n"
158 "max total shared memory (pages) = %lu\n" 158 "max total shared memory (pages) = %lu\n"
159 "min seg size (bytes) = %lu\n", 159 "min seg size (bytes) = %lu\n",
160 (unsigned long) shminfo.shmmni, 160 (unsigned long) shminfo.shmmni,
161 (unsigned long) (shminfo.shmmax >> 10), 161 (unsigned long) (shminfo.shmmax >> 10),
162 (unsigned long) shminfo.shmall, 162 (unsigned long) shminfo.shmall,
163 (unsigned long) shminfo.shmmin); 163 (unsigned long) shminfo.shmmin);
164 return; 164 return;
165 165
166 case STATUS: 166 case STATUS:
167 printf("------ Shared Memory %s --------\n", "Status"); 167 printf("------ Shared Memory %s --------\n", "Status");
168 printf( "segments allocated %d\n" 168 printf("segments allocated %d\n"
169 "pages allocated %ld\n" 169 "pages allocated %ld\n"
170 "pages resident %ld\n" 170 "pages resident %ld\n"
171 "pages swapped %ld\n" 171 "pages swapped %ld\n"
172 "Swap performance: %ld attempts\t%ld successes\n", 172 "Swap performance: %ld attempts\t%ld successes\n",
173 shm_info.used_ids, 173 shm_info.used_ids,
174 shm_info.shm_tot, 174 shm_info.shm_tot,
175 shm_info.shm_rss, 175 shm_info.shm_rss,
176 shm_info.shm_swp, 176 shm_info.shm_swp,
177 shm_info.swap_attempts, shm_info.swap_successes); 177 shm_info.swap_attempts, shm_info.swap_successes);
178 return; 178 return;
179 179
180 case CREATOR: 180 case CREATOR:
181 printf("------ Shared Memory %s --------\n", "Segment Creators/Owners"); 181 printf("------ Shared Memory %s --------\n", "Segment Creators/Owners");
182 printf( "%-10s %-10s %-10s %-10s %-10s %-10s\n", 182 printf("%-10s %-10s %-10s %-10s %-10s %-10s\n",
183 "shmid", "perms", "cuid", "cgid", "uid", "gid"); 183 "shmid", "perms", "cuid", "cgid", "uid", "gid");
184 break; 184 break;
185 185
186 case TIME: 186 case TIME:
187 printf("------ Shared Memory %s --------\n", "Attach/Detach/Change Times"); 187 printf("------ Shared Memory %s --------\n", "Attach/Detach/Change Times");
188 printf( "%-10s %-10s %-20s %-20s %-20s\n", 188 printf("%-10s %-10s %-20s %-20s %-20s\n",
189 "shmid", "owner", "attached", "detached", "changed"); 189 "shmid", "owner", "attached", "detached", "changed");
190 break; 190 break;
191 191
192 case PID: 192 case PID:
193 printf("------ Shared Memory %s --------\n", "Creator/Last-op"); 193 printf("------ Shared Memory %s --------\n", "Creator/Last-op");
194 printf( "%-10s %-10s %-10s %-10s\n", 194 printf("%-10s %-10s %-10s %-10s\n",
195 "shmid", "owner", "cpid", "lpid"); 195 "shmid", "owner", "cpid", "lpid");
196 break; 196 break;
197 197
198 default: 198 default:
199 printf("------ Shared Memory %s --------\n", "Segments"); 199 printf("------ Shared Memory %s --------\n", "Segments");
200 printf( "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 200 printf("%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n",
201 "key", "shmid", "owner", "perms", "bytes", "nattch", 201 "key", "shmid", "owner", "perms", "bytes", "nattch",
202 "status"); 202 "status");
203 break; 203 break;
204 } 204 }
205 205
@@ -220,11 +220,11 @@ static NOINLINE void do_shm(void)
220 printf("%-10d %-10d", shmid, ipcp->uid); 220 printf("%-10d %-10d", shmid, ipcp->uid);
221 /* ctime uses static buffer: use separate calls */ 221 /* ctime uses static buffer: use separate calls */
222 printf(" %-20.16s", shmseg.shm_atime 222 printf(" %-20.16s", shmseg.shm_atime
223 ? ctime(&shmseg.shm_atime) + 4 : "Not set"); 223 ? ctime(&shmseg.shm_atime) + 4 : "Not set");
224 printf(" %-20.16s", shmseg.shm_dtime 224 printf(" %-20.16s", shmseg.shm_dtime
225 ? ctime(&shmseg.shm_dtime) + 4 : "Not set"); 225 ? ctime(&shmseg.shm_dtime) + 4 : "Not set");
226 printf(" %-20.16s\n", shmseg.shm_ctime 226 printf(" %-20.16s\n", shmseg.shm_ctime
227 ? ctime(&shmseg.shm_ctime) + 4 : "Not set"); 227 ? ctime(&shmseg.shm_ctime) + 4 : "Not set");
228 break; 228 break;
229 case PID: 229 case PID:
230 if (pw) 230 if (pw)
@@ -241,17 +241,17 @@ static NOINLINE void do_shm(void)
241 else 241 else
242 printf("%-10d %-10d", shmid, ipcp->uid); 242 printf("%-10d %-10d", shmid, ipcp->uid);
243 printf(" %-10o %-10lu %-10ld %-6s %-6s\n", ipcp->mode & 0777, 243 printf(" %-10o %-10lu %-10ld %-6s %-6s\n", ipcp->mode & 0777,
244 /* 244 /*
245 * earlier: int, Austin has size_t 245 * earlier: int, Austin has size_t
246 */ 246 */
247 (unsigned long) shmseg.shm_segsz, 247 (unsigned long) shmseg.shm_segsz,
248 /* 248 /*
249 * glibc-2.1.3 and earlier has unsigned short; 249 * glibc-2.1.3 and earlier has unsigned short;
250 * Austin has shmatt_t 250 * Austin has shmatt_t
251 */ 251 */
252 (long) shmseg.shm_nattch, 252 (long) shmseg.shm_nattch,
253 ipcp->mode & SHM_DEST ? "dest" : " ", 253 ipcp->mode & SHM_DEST ? "dest" : " ",
254 ipcp->mode & SHM_LOCKED ? "locked" : " "); 254 ipcp->mode & SHM_LOCKED ? "locked" : " ");
255 break; 255 break;
256 } 256 }
257 } 257 }
@@ -281,32 +281,32 @@ static NOINLINE void do_sem(void)
281 if ((semctl(0, 0, IPC_INFO, arg)) < 0) 281 if ((semctl(0, 0, IPC_INFO, arg)) < 0)
282 return; 282 return;
283 printf("max number of arrays = %d\n" 283 printf("max number of arrays = %d\n"
284 "max semaphores per array = %d\n" 284 "max semaphores per array = %d\n"
285 "max semaphores system wide = %d\n" 285 "max semaphores system wide = %d\n"
286 "max ops per semop call = %d\n" 286 "max ops per semop call = %d\n"
287 "semaphore max value = %d\n", 287 "semaphore max value = %d\n",
288 seminfo.semmni, 288 seminfo.semmni,
289 seminfo.semmsl, 289 seminfo.semmsl,
290 seminfo.semmns, seminfo.semopm, seminfo.semvmx); 290 seminfo.semmns, seminfo.semopm, seminfo.semvmx);
291 return; 291 return;
292 292
293 case STATUS: 293 case STATUS:
294 printf("------ Semaphore %s --------\n", "Status"); 294 printf("------ Semaphore %s --------\n", "Status");
295 printf( "used arrays = %d\n" 295 printf("used arrays = %d\n"
296 "allocated semaphores = %d\n", 296 "allocated semaphores = %d\n",
297 seminfo.semusz, seminfo.semaem); 297 seminfo.semusz, seminfo.semaem);
298 return; 298 return;
299 299
300 case CREATOR: 300 case CREATOR:
301 printf("------ Semaphore %s --------\n", "Arrays Creators/Owners"); 301 printf("------ Semaphore %s --------\n", "Arrays Creators/Owners");
302 printf( "%-10s %-10s %-10s %-10s %-10s %-10s\n", 302 printf("%-10s %-10s %-10s %-10s %-10s %-10s\n",
303 "semid", "perms", "cuid", "cgid", "uid", "gid"); 303 "semid", "perms", "cuid", "cgid", "uid", "gid");
304 break; 304 break;
305 305
306 case TIME: 306 case TIME:
307 printf("------ Shared Memory %s --------\n", "Operation/Change Times"); 307 printf("------ Shared Memory %s --------\n", "Operation/Change Times");
308 printf( "%-8s %-10s %-26.24s %-26.24s\n", 308 printf("%-8s %-10s %-26.24s %-26.24s\n",
309 "shmid", "owner", "last-op", "last-changed"); 309 "shmid", "owner", "last-op", "last-changed");
310 break; 310 break;
311 311
312 case PID: 312 case PID:
@@ -314,8 +314,8 @@ static NOINLINE void do_sem(void)
314 314
315 default: 315 default:
316 printf("------ Semaphore %s --------\n", "Arrays"); 316 printf("------ Semaphore %s --------\n", "Arrays");
317 printf( "%-10s %-10s %-10s %-10s %-10s\n", 317 printf("%-10s %-10s %-10s %-10s %-10s\n",
318 "key", "semid", "owner", "perms", "nsems"); 318 "key", "semid", "owner", "perms", "nsems");
319 break; 319 break;
320 } 320 }
321 321
@@ -337,9 +337,9 @@ static NOINLINE void do_sem(void)
337 printf("%-8d %-10d", semid, ipcp->uid); 337 printf("%-8d %-10d", semid, ipcp->uid);
338 /* ctime uses static buffer: use separate calls */ 338 /* ctime uses static buffer: use separate calls */
339 printf(" %-26.24s", semary.sem_otime 339 printf(" %-26.24s", semary.sem_otime
340 ? ctime(&semary.sem_otime) : "Not set"); 340 ? ctime(&semary.sem_otime) : "Not set");
341 printf(" %-26.24s\n", semary.sem_ctime 341 printf(" %-26.24s\n", semary.sem_ctime
342 ? ctime(&semary.sem_ctime) : "Not set"); 342 ? ctime(&semary.sem_ctime) : "Not set");
343 break; 343 break;
344 case PID: 344 case PID:
345 break; 345 break;
@@ -351,13 +351,13 @@ static NOINLINE void do_sem(void)
351 else 351 else
352 printf("%-10d %-9d", semid, ipcp->uid); 352 printf("%-10d %-9d", semid, ipcp->uid);
353 printf(" %-10o %-10ld\n", ipcp->mode & 0777, 353 printf(" %-10o %-10ld\n", ipcp->mode & 0777,
354 /* 354 /*
355 * glibc-2.1.3 and earlier has unsigned short; 355 * glibc-2.1.3 and earlier has unsigned short;
356 * glibc-2.1.91 has variation between 356 * glibc-2.1.91 has variation between
357 * unsigned short and unsigned long 357 * unsigned short and unsigned long
358 * Austin prescribes unsigned short. 358 * Austin prescribes unsigned short.
359 */ 359 */
360 (long) semary.sem_nsems); 360 (long) semary.sem_nsems);
361 break; 361 break;
362 } 362 }
363 } 363 }
@@ -383,42 +383,42 @@ static NOINLINE void do_msg(void)
383 if ((msgctl(0, IPC_INFO, (struct msqid_ds *) (void *) &msginfo)) < 0) 383 if ((msgctl(0, IPC_INFO, (struct msqid_ds *) (void *) &msginfo)) < 0)
384 return; 384 return;
385 printf("------ Message%s --------\n", "s: Limits"); 385 printf("------ Message%s --------\n", "s: Limits");
386 printf( "max queues system wide = %d\n" 386 printf("max queues system wide = %d\n"
387 "max size of message (bytes) = %d\n" 387 "max size of message (bytes) = %d\n"
388 "default max size of queue (bytes) = %d\n", 388 "default max size of queue (bytes) = %d\n",
389 msginfo.msgmni, msginfo.msgmax, msginfo.msgmnb); 389 msginfo.msgmni, msginfo.msgmax, msginfo.msgmnb);
390 return; 390 return;
391 391
392 case STATUS: 392 case STATUS:
393 printf("------ Message%s --------\n", "s: Status"); 393 printf("------ Message%s --------\n", "s: Status");
394 printf( "allocated queues = %d\n" 394 printf("allocated queues = %d\n"
395 "used headers = %d\n" 395 "used headers = %d\n"
396 "used space = %d bytes\n", 396 "used space = %d bytes\n",
397 msginfo.msgpool, msginfo.msgmap, msginfo.msgtql); 397 msginfo.msgpool, msginfo.msgmap, msginfo.msgtql);
398 return; 398 return;
399 399
400 case CREATOR: 400 case CREATOR:
401 printf("------ Message%s --------\n", " Queues: Creators/Owners"); 401 printf("------ Message%s --------\n", " Queues: Creators/Owners");
402 printf( "%-10s %-10s %-10s %-10s %-10s %-10s\n", 402 printf("%-10s %-10s %-10s %-10s %-10s %-10s\n",
403 "msqid", "perms", "cuid", "cgid", "uid", "gid"); 403 "msqid", "perms", "cuid", "cgid", "uid", "gid");
404 break; 404 break;
405 405
406 case TIME: 406 case TIME:
407 printf("------ Message%s --------\n", " Queues Send/Recv/Change Times"); 407 printf("------ Message%s --------\n", " Queues Send/Recv/Change Times");
408 printf( "%-8s %-10s %-20s %-20s %-20s\n", 408 printf("%-8s %-10s %-20s %-20s %-20s\n",
409 "msqid", "owner", "send", "recv", "change"); 409 "msqid", "owner", "send", "recv", "change");
410 break; 410 break;
411 411
412 case PID: 412 case PID:
413 printf("------ Message%s --------\n", " Queues PIDs"); 413 printf("------ Message%s --------\n", " Queues PIDs");
414 printf( "%-10s %-10s %-10s %-10s\n", 414 printf("%-10s %-10s %-10s %-10s\n",
415 "msqid", "owner", "lspid", "lrpid"); 415 "msqid", "owner", "lspid", "lrpid");
416 break; 416 break;
417 417
418 default: 418 default:
419 printf("------ Message%s --------\n", " Queues"); 419 printf("------ Message%s --------\n", " Queues");
420 printf( "%-10s %-10s %-10s %-10s %-12s %-12s\n", 420 printf("%-10s %-10s %-10s %-10s %-12s %-12s\n",
421 "key", "msqid", "owner", "perms", "used-bytes", "messages"); 421 "key", "msqid", "owner", "perms", "used-bytes", "messages");
422 break; 422 break;
423 } 423 }
424 424
@@ -438,11 +438,11 @@ static NOINLINE void do_msg(void)
438 else 438 else
439 printf("%-8d %-10d", msqid, ipcp->uid); 439 printf("%-8d %-10d", msqid, ipcp->uid);
440 printf(" %-20.16s", msgque.msg_stime 440 printf(" %-20.16s", msgque.msg_stime
441 ? ctime(&msgque.msg_stime) + 4 : "Not set"); 441 ? ctime(&msgque.msg_stime) + 4 : "Not set");
442 printf(" %-20.16s", msgque.msg_rtime 442 printf(" %-20.16s", msgque.msg_rtime
443 ? ctime(&msgque.msg_rtime) + 4 : "Not set"); 443 ? ctime(&msgque.msg_rtime) + 4 : "Not set");
444 printf(" %-20.16s\n", msgque.msg_ctime 444 printf(" %-20.16s\n", msgque.msg_ctime
445 ? ctime(&msgque.msg_ctime) + 4 : "Not set"); 445 ? ctime(&msgque.msg_ctime) + 4 : "Not set");
446 break; 446 break;
447 case PID: 447 case PID:
448 if (pw) 448 if (pw)
@@ -459,13 +459,13 @@ static NOINLINE void do_msg(void)
459 else 459 else
460 printf("%-10d %-10d", msqid, ipcp->uid); 460 printf("%-10d %-10d", msqid, ipcp->uid);
461 printf(" %-10o %-12ld %-12ld\n", ipcp->mode & 0777, 461 printf(" %-10o %-12ld %-12ld\n", ipcp->mode & 0777,
462 /* 462 /*
463 * glibc-2.1.3 and earlier has unsigned short; 463 * glibc-2.1.3 and earlier has unsigned short;
464 * glibc-2.1.91 has variation between 464 * glibc-2.1.91 has variation between
465 * unsigned short, unsigned long 465 * unsigned short, unsigned long
466 * Austin has msgqnum_t 466 * Austin has msgqnum_t
467 */ 467 */
468 (long) msgque.msg_cbytes, (long) msgque.msg_qnum); 468 (long) msgque.msg_cbytes, (long) msgque.msg_qnum);
469 break; 469 break;
470 } 470 }
471 } 471 }
@@ -483,18 +483,18 @@ static void print_shm(int shmid)
483 } 483 }
484 484
485 printf("\nShared memory Segment shmid=%d\n" 485 printf("\nShared memory Segment shmid=%d\n"
486 "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n" 486 "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
487 "mode=%#o\taccess_perms=%#o\n" 487 "mode=%#o\taccess_perms=%#o\n"
488 "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n", 488 "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n",
489 shmid, 489 shmid,
490 ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid, 490 ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid,
491 ipcp->mode, ipcp->mode & 0777, 491 ipcp->mode, ipcp->mode & 0777,
492 (long) shmds.shm_segsz, shmds.shm_lpid, shmds.shm_cpid, 492 (long) shmds.shm_segsz, shmds.shm_lpid, shmds.shm_cpid,
493 (long) shmds.shm_nattch); 493 (long) shmds.shm_nattch);
494 printf("att_time=%-26.24s\n", 494 printf("att_time=%-26.24s\n",
495 shmds.shm_atime ? ctime(&shmds.shm_atime) : "Not set"); 495 shmds.shm_atime ? ctime(&shmds.shm_atime) : "Not set");
496 printf("det_time=%-26.24s\n", 496 printf("det_time=%-26.24s\n",
497 shmds.shm_dtime ? ctime(&shmds.shm_dtime) : "Not set"); 497 shmds.shm_dtime ? ctime(&shmds.shm_dtime) : "Not set");
498 printf("change_time=%-26.24s\n\n", ctime(&shmds.shm_ctime)); 498 printf("change_time=%-26.24s\n\n", ctime(&shmds.shm_ctime));
499} 499}
500 500
@@ -510,24 +510,24 @@ static void print_msg(int msqid)
510 } 510 }
511 511
512 printf("\nMessage Queue msqid=%d\n" 512 printf("\nMessage Queue msqid=%d\n"
513 "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n" 513 "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
514 "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 514 "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n",
515 msqid, ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid, ipcp->mode, 515 msqid, ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid, ipcp->mode,
516 /* 516 /*
517 * glibc-2.1.3 and earlier has unsigned short; 517 * glibc-2.1.3 and earlier has unsigned short;
518 * glibc-2.1.91 has variation between 518 * glibc-2.1.91 has variation between
519 * unsigned short, unsigned long 519 * unsigned short, unsigned long
520 * Austin has msgqnum_t (for msg_qbytes) 520 * Austin has msgqnum_t (for msg_qbytes)
521 */ 521 */
522 (long) buf.msg_cbytes, (long) buf.msg_qbytes, 522 (long) buf.msg_cbytes, (long) buf.msg_qbytes,
523 (long) buf.msg_qnum, buf.msg_lspid, buf.msg_lrpid); 523 (long) buf.msg_qnum, buf.msg_lspid, buf.msg_lrpid);
524 524
525 printf("send_time=%-26.24s\n", 525 printf("send_time=%-26.24s\n",
526 buf.msg_stime ? ctime(&buf.msg_stime) : "Not set"); 526 buf.msg_stime ? ctime(&buf.msg_stime) : "Not set");
527 printf("rcv_time=%-26.24s\n", 527 printf("rcv_time=%-26.24s\n",
528 buf.msg_rtime ? ctime(&buf.msg_rtime) : "Not set"); 528 buf.msg_rtime ? ctime(&buf.msg_rtime) : "Not set");
529 printf("change_time=%-26.24s\n\n", 529 printf("change_time=%-26.24s\n\n",
530 buf.msg_ctime ? ctime(&buf.msg_ctime) : "Not set"); 530 buf.msg_ctime ? ctime(&buf.msg_ctime) : "Not set");
531} 531}
532 532
533static void print_sem(int semid) 533static void print_sem(int semid)
@@ -544,19 +544,19 @@ static void print_sem(int semid)
544 } 544 }
545 545
546 printf("\nSemaphore Array semid=%d\n" 546 printf("\nSemaphore Array semid=%d\n"
547 "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n" 547 "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
548 "mode=%#o, access_perms=%#o\n" 548 "mode=%#o, access_perms=%#o\n"
549 "nsems = %ld\n" 549 "nsems = %ld\n"
550 "otime = %-26.24s\n", 550 "otime = %-26.24s\n",
551 semid, 551 semid,
552 ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid, 552 ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid,
553 ipcp->mode, ipcp->mode & 0777, 553 ipcp->mode, ipcp->mode & 0777,
554 (long) semds.sem_nsems, 554 (long) semds.sem_nsems,
555 semds.sem_otime ? ctime(&semds.sem_otime) : "Not set"); 555 semds.sem_otime ? ctime(&semds.sem_otime) : "Not set");
556 printf("ctime = %-26.24s\n" 556 printf("ctime = %-26.24s\n"
557 "%-10s %-10s %-10s %-10s %-10s\n", 557 "%-10s %-10s %-10s %-10s %-10s\n",
558 ctime(&semds.sem_ctime), 558 ctime(&semds.sem_ctime),
559 "semnum", "value", "ncount", "zcount", "pid"); 559 "semnum", "value", "ncount", "zcount", "pid");
560 560
561 arg.val = 0; 561 arg.val = 0;
562 for (i = 0; i < semds.sem_nsems; i++) { 562 for (i = 0; i < semds.sem_nsems; i++) {
diff --git a/util-linux/lspci.c b/util-linux/lspci.c
index 5184858d1..514678afd 100644
--- a/util-linux/lspci.c
+++ b/util-linux/lspci.c
@@ -74,11 +74,11 @@ static int FAST_FUNC fileAction(
74 74
75 if (option_mask32 & OPT_m) { 75 if (option_mask32 & OPT_m) {
76 printf("%s \"Class %04x\" \"%04x\" \"%04x\" \"%04x\" \"%04x\"", 76 printf("%s \"Class %04x\" \"%04x\" \"%04x\" \"%04x\" \"%04x\"",
77 pci_slot_name, pci_class, pci_vid, pci_did, 77 pci_slot_name, pci_class, pci_vid, pci_did,
78 pci_subsys_vid, pci_subsys_did); 78 pci_subsys_vid, pci_subsys_did);
79 } else { 79 } else {
80 printf("%s Class %04x: %04x:%04x", 80 printf("%s Class %04x: %04x:%04x",
81 pci_slot_name, pci_class, pci_vid, pci_did); 81 pci_slot_name, pci_class, pci_vid, pci_did);
82 } 82 }
83 83
84 if ((option_mask32 & OPT_k) && driver) { 84 if ((option_mask32 & OPT_k) && driver) {
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 525fdcce9..bcb298c07 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -927,7 +927,7 @@ static bool_t xdr_fhandle(XDR *xdrs, fhandle objp)
927static bool_t xdr_fhstatus(XDR *xdrs, fhstatus *objp) 927static bool_t xdr_fhstatus(XDR *xdrs, fhstatus *objp)
928{ 928{
929 if (!xdr_u_int(xdrs, &objp->fhs_status)) 929 if (!xdr_u_int(xdrs, &objp->fhs_status))
930 return FALSE; 930 return FALSE;
931 if (objp->fhs_status == 0) 931 if (objp->fhs_status == 0)
932 return xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle); 932 return xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle);
933 return TRUE; 933 return TRUE;
@@ -941,8 +941,8 @@ static bool_t xdr_dirpath(XDR *xdrs, dirpath *objp)
941static bool_t xdr_fhandle3(XDR *xdrs, fhandle3 *objp) 941static bool_t xdr_fhandle3(XDR *xdrs, fhandle3 *objp)
942{ 942{
943 return xdr_bytes(xdrs, (char **)&objp->fhandle3_val, 943 return xdr_bytes(xdrs, (char **)&objp->fhandle3_val,
944 (unsigned int *) &objp->fhandle3_len, 944 (unsigned int *) &objp->fhandle3_len,
945 FHSIZE3); 945 FHSIZE3);
946} 946}
947 947
948static bool_t xdr_mountres3_ok(XDR *xdrs, mountres3_ok *objp) 948static bool_t xdr_mountres3_ok(XDR *xdrs, mountres3_ok *objp)
@@ -950,10 +950,10 @@ static bool_t xdr_mountres3_ok(XDR *xdrs, mountres3_ok *objp)
950 if (!xdr_fhandle3(xdrs, &objp->fhandle)) 950 if (!xdr_fhandle3(xdrs, &objp->fhandle))
951 return FALSE; 951 return FALSE;
952 return xdr_array(xdrs, &(objp->auth_flavours.auth_flavours_val), 952 return xdr_array(xdrs, &(objp->auth_flavours.auth_flavours_val),
953 &(objp->auth_flavours.auth_flavours_len), 953 &(objp->auth_flavours.auth_flavours_len),
954 ~0, 954 ~0,
955 sizeof(int), 955 sizeof(int),
956 (xdrproc_t) xdr_int); 956 (xdrproc_t) xdr_int);
957} 957}
958 958
959static bool_t xdr_mountstat3(XDR *xdrs, mountstat3 *objp) 959static bool_t xdr_mountstat3(XDR *xdrs, mountstat3 *objp)
@@ -1522,19 +1522,19 @@ static NOINLINE int nfsmount(struct mntent *mp, unsigned long vfsflags, char *fi
1522 switch (pm_mnt.pm_prot) { 1522 switch (pm_mnt.pm_prot) {
1523 case IPPROTO_UDP: 1523 case IPPROTO_UDP:
1524 mclient = clntudp_create(&mount_server_addr, 1524 mclient = clntudp_create(&mount_server_addr,
1525 pm_mnt.pm_prog, 1525 pm_mnt.pm_prog,
1526 pm_mnt.pm_vers, 1526 pm_mnt.pm_vers,
1527 retry_timeout, 1527 retry_timeout,
1528 &msock); 1528 &msock);
1529 if (mclient) 1529 if (mclient)
1530 break; 1530 break;
1531 mount_server_addr.sin_port = htons(pm_mnt.pm_port); 1531 mount_server_addr.sin_port = htons(pm_mnt.pm_port);
1532 msock = RPC_ANYSOCK; 1532 msock = RPC_ANYSOCK;
1533 case IPPROTO_TCP: 1533 case IPPROTO_TCP:
1534 mclient = clnttcp_create(&mount_server_addr, 1534 mclient = clnttcp_create(&mount_server_addr,
1535 pm_mnt.pm_prog, 1535 pm_mnt.pm_prog,
1536 pm_mnt.pm_vers, 1536 pm_mnt.pm_vers,
1537 &msock, 0, 0); 1537 &msock, 0, 0);
1538 break; 1538 break;
1539 default: 1539 default:
1540 mclient = NULL; 1540 mclient = NULL;
@@ -1555,18 +1555,18 @@ static NOINLINE int nfsmount(struct mntent *mp, unsigned long vfsflags, char *fi
1555 1555
1556 if (pm_mnt.pm_vers == 3) 1556 if (pm_mnt.pm_vers == 3)
1557 clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT, 1557 clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT,
1558 (xdrproc_t) xdr_dirpath, 1558 (xdrproc_t) xdr_dirpath,
1559 (caddr_t) &pathname, 1559 (caddr_t) &pathname,
1560 (xdrproc_t) xdr_mountres3, 1560 (xdrproc_t) xdr_mountres3,
1561 (caddr_t) &status, 1561 (caddr_t) &status,
1562 total_timeout); 1562 total_timeout);
1563 else 1563 else
1564 clnt_stat = clnt_call(mclient, MOUNTPROC_MNT, 1564 clnt_stat = clnt_call(mclient, MOUNTPROC_MNT,
1565 (xdrproc_t) xdr_dirpath, 1565 (xdrproc_t) xdr_dirpath,
1566 (caddr_t) &pathname, 1566 (caddr_t) &pathname,
1567 (xdrproc_t) xdr_fhstatus, 1567 (xdrproc_t) xdr_fhstatus,
1568 (caddr_t) &status, 1568 (caddr_t) &status,
1569 total_timeout); 1569 total_timeout);
1570 1570
1571 if (clnt_stat == RPC_SUCCESS) 1571 if (clnt_stat == RPC_SUCCESS)
1572 goto prepare_kernel_data; /* we're done */ 1572 goto prepare_kernel_data; /* we're done */
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index 4ed801137..974fe89c4 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -163,7 +163,7 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
163 while (fgets(mapline, S_LEN, map)) { 163 while (fgets(mapline, S_LEN, map)) {
164 if (sscanf(mapline, "%llx %s %s", &fn_add, mode, fn_name) != 3) 164 if (sscanf(mapline, "%llx %s %s", &fn_add, mode, fn_name) != 3)
165 bb_error_msg_and_die("%s(%i): wrong map line", 165 bb_error_msg_and_die("%s(%i): wrong map line",
166 mapFile, maplineno); 166 mapFile, maplineno);
167 167
168 if (!strcmp(fn_name, "_stext")) /* only elf works like this */ { 168 if (!strcmp(fn_name, "_stext")) /* only elf works like this */ {
169 add0 = fn_add; 169 add0 = fn_add;
@@ -198,7 +198,7 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
198 198
199 if (indx >= len / sizeof(*buf)) 199 if (indx >= len / sizeof(*buf))
200 bb_error_msg_and_die("profile address out of range. " 200 bb_error_msg_and_die("profile address out of range. "
201 "Wrong map file?"); 201 "Wrong map file?");
202 202
203 while (indx < (next_add-add0)/step) { 203 while (indx < (next_add-add0)/step) {
204 if (optBins && (buf[indx] || optAll)) { 204 if (optBins && (buf[indx] || optAll)) {
@@ -220,10 +220,10 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
220 ) { 220 ) {
221 if (optVerbose) 221 if (optVerbose)
222 printf("%016llx %-40s %6i %8.4f\n", fn_add, 222 printf("%016llx %-40s %6i %8.4f\n", fn_add,
223 fn_name, this, this/(double)fn_len); 223 fn_name, this, this/(double)fn_len);
224 else 224 else
225 printf("%6i %-40s %8.4f\n", 225 printf("%6i %-40s %8.4f\n",
226 this, fn_name, this/(double)fn_len); 226 this, fn_name, this/(double)fn_len);
227 if (optSub) { 227 if (optSub) {
228 unsigned long long scan; 228 unsigned long long scan;
229 229
@@ -233,8 +233,8 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
233 233
234 addr = (scan - 1)*step + add0; 234 addr = (scan - 1)*step + add0;
235 printf("\t%#llx\t%s+%#llx\t%u\n", 235 printf("\t%#llx\t%s+%#llx\t%u\n",
236 addr, fn_name, addr - fn_add, 236 addr, fn_name, addr - fn_add,
237 buf[scan]); 237 buf[scan]);
238 } 238 }
239 } 239 }
240 } 240 }
@@ -251,10 +251,10 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
251 /* trailer */ 251 /* trailer */
252 if (optVerbose) 252 if (optVerbose)
253 printf("%016x %-40s %6i %8.4f\n", 253 printf("%016x %-40s %6i %8.4f\n",
254 0, "total", total, total/(double)(fn_add-add0)); 254 0, "total", total, total/(double)(fn_add-add0));
255 else 255 else
256 printf("%6i %-40s %8.4f\n", 256 printf("%6i %-40s %8.4f\n",
257 total, "total", total/(double)(fn_add-add0)); 257 total, "total", total/(double)(fn_add-add0));
258 258
259 fclose(map); 259 fclose(map);
260 free(buf); 260 free(buf);
diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c
index 761e54f9f..209eaabe9 100644
--- a/util-linux/volume_id/linux_raid.c
+++ b/util-linux/volume_id/linux_raid.c
@@ -69,9 +69,9 @@ int FAST_FUNC volume_id_probe_linux_raid(struct volume_id *id /*,uint64_t off*/,
69 volume_id_set_uuid(id, uuid, UUID_DCE); 69 volume_id_set_uuid(id, uuid, UUID_DCE);
70 70
71// snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u", 71// snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%u.%u",
72// le32_to_cpu(mdp->major_version), 72// le32_to_cpu(mdp->major_version),
73// le32_to_cpu(mdp->minor_version), 73// le32_to_cpu(mdp->minor_version),
74// le32_to_cpu(mdp->patch_version)); 74// le32_to_cpu(mdp->patch_version));
75 75
76 dbg("found raid signature"); 76 dbg("found raid signature");
77// volume_id_set_usage(id, VOLUME_ID_RAID); 77// volume_id_set_usage(id, VOLUME_ID_RAID);
diff --git a/util-linux/volume_id/util.c b/util-linux/volume_id/util.c
index 0e2d24be0..061545fde 100644
--- a/util-linux/volume_id/util.c
+++ b/util-linux/volume_id/util.c
@@ -129,7 +129,7 @@ void volume_id_set_label_string(struct volume_id *id, const uint8_t *buf, size_t
129 129
130void volume_id_set_label_unicode16(struct volume_id *id, const uint8_t *buf, enum endian endianess, size_t count) 130void volume_id_set_label_unicode16(struct volume_id *id, const uint8_t *buf, enum endian endianess, size_t count)
131{ 131{
132 volume_id_set_unicode16(id->label, sizeof(id->label), buf, endianess, count); 132 volume_id_set_unicode16(id->label, sizeof(id->label), buf, endianess, count);
133} 133}
134 134
135void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, enum uuid_format format) 135void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, enum uuid_format format)
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-11 15:27:02 +0000