|
Lucio Andrés Illanes Albornoz |
093ede |
diff -ru util-linux-2.34.orig/sys-utils/ipcs.c util-linux-2.34/sys-utils/ipcs.c
|
|
Lucio Andrés Illanes Albornoz |
093ede |
--- util-linux-2.34.orig/sys-utils/ipcs.c 2019-04-24 11:02:03.122448801 +0200
|
|
Lucio Andrés Illanes Albornoz |
093ede |
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -306,7 +306,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if (pw)
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf ("%-10d %-10.10s", shmdsp->shm_perm.id, pw->pw_name);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
else
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- printf ("%-10d %-10u", shmdsp->shm_perm.id, shmdsp->shm_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ printf ("%-10d %-10lu", shmdsp->shm_perm.id, shmdsp->shm_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf(" %-20.16s", shmdsp->shm_atim
|
|
Lucio Andrés Illanes Albornoz |
093ede |
? xctime(&shmdsp->shm_atim) + 4 : _("Not set"));
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -319,7 +319,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if (pw)
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf ("%-10d %-10.10s", shmdsp->shm_perm.id, pw->pw_name);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
else
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- printf ("%-10d %-10u", shmdsp->shm_perm.id, shmdsp->shm_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ printf ("%-10d %-10lu", shmdsp->shm_perm.id, shmdsp->shm_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf (" %-10u %-10u\n",
|
|
Lucio Andrés Illanes Albornoz |
093ede |
shmdsp->shm_cprid, shmdsp->shm_lprid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
break;
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -329,7 +329,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if (pw)
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf ("%-10d %-10.10s", shmdsp->shm_perm.id, pw->pw_name);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
else
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- printf ("%-10d %-10u", shmdsp->shm_perm.id, shmdsp->shm_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ printf ("%-10d %-10lu", shmdsp->shm_perm.id, shmdsp->shm_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf (" %-10o ", shmdsp->shm_perm.mode & 0777);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if (unit == IPC_UNIT_HUMAN)
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -425,7 +425,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if (pw)
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf ("%-8d %-10.10s", semdsp->sem_perm.id, pw->pw_name);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
else
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- printf ("%-8d %-10u", semdsp->sem_perm.id, semdsp->sem_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ printf ("%-8d %-10lu", semdsp->sem_perm.id, semdsp->sem_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf (" %-26.24s", semdsp->sem_otime
|
|
Lucio Andrés Illanes Albornoz |
093ede |
? xctime(&semdsp->sem_otime) : _("Not set"));
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf (" %-26.24s\n", semdsp->sem_ctime
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -439,7 +439,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if (pw)
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf ("%-10d %-10.10s", semdsp->sem_perm.id, pw->pw_name);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
else
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- printf ("%-10d %-10u", semdsp->sem_perm.id, semdsp->sem_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ printf ("%-10d %-10lu", semdsp->sem_perm.id, semdsp->sem_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf (" %-10o %-10ju\n",
|
|
Lucio Andrés Illanes Albornoz |
093ede |
semdsp->sem_perm.mode & 0777,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
semdsp->sem_nsems);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -533,7 +533,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if (pw)
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf ("%-8d %-10.10s", msgdsp->msg_perm.id, pw->pw_name);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
else
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- printf ("%-8d %-10u", msgdsp->msg_perm.id, msgdsp->msg_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ printf ("%-8d %-10lu", msgdsp->msg_perm.id, msgdsp->msg_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf (" %-20.16s", msgdsp->q_stime
|
|
Lucio Andrés Illanes Albornoz |
093ede |
? xctime(&msgdsp->q_stime) + 4 : _("Not set"));
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf (" %-20.16s", msgdsp->q_rtime
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -545,7 +545,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if (pw)
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf ("%-8d %-10.10s", msgdsp->msg_perm.id, pw->pw_name);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
else
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- printf ("%-8d %-10u", msgdsp->msg_perm.id, msgdsp->msg_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ printf ("%-8d %-10lu", msgdsp->msg_perm.id, msgdsp->msg_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf (" %5d %5d\n",
|
|
Lucio Andrés Illanes Albornoz |
093ede |
msgdsp->q_lspid, msgdsp->q_lrpid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
break;
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -555,7 +555,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if (pw)
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf ("%-10d %-10.10s", msgdsp->msg_perm.id, pw->pw_name);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
else
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- printf ("%-10d %-10u", msgdsp->msg_perm.id, msgdsp->msg_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ printf ("%-10d %-10lu", msgdsp->msg_perm.id, msgdsp->msg_perm.uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf (" %-10o ", msgdsp->msg_perm.mode & 0777);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if (unit == IPC_UNIT_HUMAN)
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -582,7 +582,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
}
|
|
Lucio Andrés Illanes Albornoz |
093ede |
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf(_("\nShared memory Segment shmid=%d\n"), shmid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- printf(_("uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"),
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ printf(_("uid=%lu\tgid=%lu\tcuid=%lu\tcgid=%lu\n"),
|
|
Lucio Andrés Illanes Albornoz |
093ede |
shmdata->shm_perm.uid, shmdata->shm_perm.gid,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
shmdata->shm_perm.cuid, shmdata->shm_perm.cgid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf(_("mode=%#o\taccess_perms=%#o\n"), shmdata->shm_perm.mode,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -612,7 +612,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
}
|
|
Lucio Andrés Illanes Albornoz |
093ede |
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf(_("\nMessage Queue msqid=%d\n"), msgid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- printf(_("uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"),
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ printf(_("uid=%lu\tgid=%lu\tcuid=%lu\tcgid=%lu\tmode=%#o\n"),
|
|
Lucio Andrés Illanes Albornoz |
093ede |
msgdata->msg_perm.uid, msgdata->msg_perm.gid,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
msgdata->msg_perm.cuid, msgdata->msg_perm.cgid,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
msgdata->msg_perm.mode);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -645,7 +645,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
}
|
|
Lucio Andrés Illanes Albornoz |
093ede |
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf(_("\nSemaphore Array semid=%d\n"), semid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- printf(_("uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"),
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ printf(_("uid=%lu\t gid=%lu\t cuid=%lu\t cgid=%lu\n"),
|
|
Lucio Andrés Illanes Albornoz |
093ede |
semdata->sem_perm.uid, semdata->sem_perm.gid,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
semdata->sem_perm.cuid, semdata->sem_perm.cgid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
printf(_("mode=%#o, access_perms=%#o\n"),
|
|
Lucio Andrés Illanes Albornoz |
093ede |
diff -ru util-linux-2.34.orig/sys-utils/ipcutils.c util-linux-2.34/sys-utils/ipcutils.c
|
|
Lucio Andrés Illanes Albornoz |
093ede |
--- util-linux-2.34.orig/sys-utils/ipcutils.c 2019-05-23 15:31:58.936589775 +0200
|
|
Lucio Andrés Illanes Albornoz |
093ede |
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -120,7 +120,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
p->shm_swp = 0xdead;
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if (sscanf(buf,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
"%d %d %o %"SCNu64 " %u %u "
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- "%"SCNu64 " %u %u %u %u %"SCNi64 " %"SCNi64 " %"SCNi64
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ "%"SCNu64 " %lu %lu %lu %lu %"SCNi64 " %"SCNi64 " %"SCNi64
|
|
Lucio Andrés Illanes Albornoz |
093ede |
" %"SCNu64 " %"SCNu64 "\n",
|
|
Lucio Andrés Illanes Albornoz |
093ede |
&p->shm_perm.key,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
&p->shm_perm.id,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -264,7 +264,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
|
|
Lucio Andrés Illanes Albornoz |
093ede |
while (feof(f) == 0) {
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if (fscanf(f,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- "%d %d %o %" SCNu64 " %u %u %u %u %"
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ "%d %d %o %" SCNu64 " %lu %lu %lu %lu %"
|
|
Lucio Andrés Illanes Albornoz |
093ede |
SCNi64 " %" SCNi64 "\n",
|
|
Lucio Andrés Illanes Albornoz |
093ede |
&p->sem_perm.key,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
&p->sem_perm.id,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -373,7 +373,7 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
while (feof(f) == 0) {
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if (fscanf(f,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
"%d %d %o %" SCNu64 " %" SCNu64
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- " %u %u %u %u %u %u %" SCNi64 " %" SCNi64 " %" SCNi64 "\n",
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ " %u %u %lu %lu %lu %lu %" SCNi64 " %" SCNi64 " %" SCNi64 "\n",
|
|
Lucio Andrés Illanes Albornoz |
093ede |
&p->msg_perm.key,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
&p->msg_perm.id,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
&p->msg_perm.mode,
|
|
Lucio Andrés Illanes Albornoz |
093ede |
@@ -474,22 +474,22 @@
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if ((pw = getpwuid(is->cuid)))
|
|
Lucio Andrés Illanes Albornoz |
093ede |
fprintf(f, " %-10s", pw->pw_name);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
else
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- fprintf(f, " %-10u", is->cuid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ fprintf(f, " %-10lu", is->cuid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if ((gr = getgrgid(is->cgid)))
|
|
Lucio Andrés Illanes Albornoz |
093ede |
fprintf(f, " %-10s", gr->gr_name);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
else
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- fprintf(f, " %-10u", is->cgid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ fprintf(f, " %-10lu", is->cgid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if ((pw = getpwuid(is->uid)))
|
|
Lucio Andrés Illanes Albornoz |
093ede |
fprintf(f, " %-10s", pw->pw_name);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
else
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- fprintf(f, " %-10u", is->uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ fprintf(f, " %-10lu", is->uid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
|
|
Lucio Andrés Illanes Albornoz |
093ede |
if ((gr = getgrgid(is->gid)))
|
|
Lucio Andrés Illanes Albornoz |
093ede |
fprintf(f, " %-10s\n", gr->gr_name);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
else
|
|
Lucio Andrés Illanes Albornoz |
093ede |
- fprintf(f, " %-10u\n", is->gid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
+ fprintf(f, " %-10lu\n", is->gid);
|
|
Lucio Andrés Illanes Albornoz |
093ede |
}
|
|
Lucio Andrés Illanes Albornoz |
093ede |
|
|
Lucio Andrés Illanes Albornoz |
093ede |
void ipc_print_size(int unit, char *msg, uint64_t size, const char *end,
|