source: MondoRescue/branches/stable/mindi-busybox/util-linux/ipcrm.c@ 1770

Last change on this file since 1770 was 1770, checked in by Bruno Cornec, 16 years ago
  • Better output for mindi-busybox revision
  • Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
  • strace useful for debug
  • fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
  • fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
  • fix typo in label-partitions-as-necessary which doesn't seem to work
  • Update to busybox 1.7.2
  • perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

  • next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
  • small optimization in mindi on keyboard handling (one single find instead of multiple)
  • better interaction for USB device when launching mindi manually
  • attempt to automatically guess block disk size for ramdisk
  • fix typos in bkphw
  • Fix the remaining problem with UUID support for swap partitions
  • Updates mondoarchive man page for USB support
  • Adds preliminary Hardware support to mindi (Proliant SSSTK)
  • Tries to add udev support also for rhel4
  • Fix UUID support which was still broken.
  • Be conservative in test for the start-nfs script
  • Update config file for mindi-busybox for 1.7.2 migration
  • Try to run around a busybox bug (1.2.2 pb on inexistant links)
  • Add build content for mindi-busybox in pb
  • Remove distributions content for mindi-busybox
  • Fix a warning on inexistant raidtab
  • Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
  • Create MONDO_CACHE and use it everywhere + creation at start
  • Really never try to eject a USB device
  • Fix a issue with &> usage (replaced with 1> and 2>)
  • Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
  • tty modes correct to avoid sh error messages
  • Use ext3 normally and not ext2 instead
  • USB device should be corrected after reading (take 1st part)
  • Adds a mount_USB_here function derived from mount_CDROM_here
  • usb detection place before /dev detection in device name at restore time
  • Fix when restoring from USB: media is asked in interactive mode
  • Adds USB support for mondorestore
  • mount_cdrom => mount_media
  • elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
  • untar-and-softlink => untar (+ interface change)
  • suppress useless softlinks creation/removal in boot process
  • avoids udevd messages on groups
  • Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
  • skip existing big file creation
  • seems to work correctly for USB mindi boot
  • Adds group and tty link to udev conf
  • Always load usb-torage (even 2.6) to initiate USB bus discovery
  • Better printing of messages
  • Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
  • Links were not correctly done as non relative for modules in mindi
  • exclusion of modules denied now works
  • Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
  • Fix bugs for DENY_MODS handling
  • Add device /dev/console for udev
  • ide-generic should now really be excluded
  • Fix a bug in major number for tty
  • If udev then adds modprobe/insmod to rootfs
  • tty0 is also cretaed with udev
  • ide-generic put rather in DENY_MODS
  • udevd remove from deplist s handled in mindi directly
  • better default for mindi when using --usb
  • Handles dynamically linked busybox (in case we want to use it soon ;-)
  • Adds fixed devices to create for udev
  • ide-generic should not be part of the initrd when using libata v2
  • support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
  • Improvement in udev support (do not use cl options not available in busybox)
  • Udev in mindi
    • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
    • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
    • add support for 64 bits udev
  • Try to render MyInsmod silent at boot time
  • Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
  • We also need vaft format support for USB boot
  • Adds libusual support (Ubuntu 7.10 needs it for USB)
  • Improve Ubuntu/Debian keyboard detection and support
  • pbinit adapted to new pb (0.8.10). Filtering of docs done in it
  • Suppress some mondo warnings and errors on USB again
  • Tries to fix lack of files in deb mindi package
  • Verify should now work for USB devices
  • More log/mesages improvement for USB support
  • - Supress g_erase_tmpdir_and_scratchdir
  • Improve some log messages for USB support
  • Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
  • Improve mindi-busybox build
  • In conformity with pb 0.8.9
  • Add support for Ubuntu 7.10 in build process
  • Add USB Key button to Menu UI (CD streamer removed)
  • Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
  • Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René Ribaud).
  • Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
  • Put mondorescue in conformity with new pb filtering rules
  • Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
  • Unmounting USB device before removal of temporary scratchdir
  • Stil refining USB copy back to mondo (one command was not executed)
  • No need to have the image subdor in the csratchdir when USB.
  • umount the USB partition before attempting to use it
  • Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

File size: 4.5 KB
Line 
1/* vi: set sw=4 ts=4: */
2/*
3 * ipcrm.c - utility to allow removal of IPC objects and data structures.
4 *
5 * 01 Sept 2004 - Rodney Radford <rradford@mindspring.com>
6 * Adapted for busybox from util-linux-2.12a.
7 *
8 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
9 */
10
11#include "libbb.h"
12
13/* X/OPEN tells us to use <sys/{types,ipc,sem}.h> for semctl() */
14/* X/OPEN tells us to use <sys/{types,ipc,msg}.h> for msgctl() */
15#include <sys/ipc.h>
16#include <sys/shm.h>
17#include <sys/msg.h>
18#include <sys/sem.h>
19
20#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
21/* union semun is defined by including <sys/sem.h> */
22#else
23/* according to X/OPEN we have to define it ourselves */
24union semun {
25 int val;
26 struct semid_ds *buf;
27 unsigned short int *array;
28 struct seminfo *__buf;
29};
30#endif
31
32#define IPCRM_LEGACY 1
33
34
35#if IPCRM_LEGACY
36
37typedef enum type_id {
38 SHM,
39 SEM,
40 MSG
41} type_id;
42
43static int remove_ids(type_id type, int argc, char **argv)
44{
45 unsigned long id;
46 int ret = 0; /* silence gcc */
47 int nb_errors = 0;
48 union semun arg;
49
50 arg.val = 0;
51
52 while (argc) {
53 id = bb_strtoul(argv[0], NULL, 10);
54 if (errno || id > INT_MAX) {
55 bb_error_msg("invalid id: %s", argv[0]);
56 nb_errors++;
57 } else {
58 if (type == SEM)
59 ret = semctl(id, 0, IPC_RMID, arg);
60 else if (type == MSG)
61 ret = msgctl(id, IPC_RMID, NULL);
62 else if (type == SHM)
63 ret = shmctl(id, IPC_RMID, NULL);
64
65 if (ret) {
66 bb_perror_msg("cannot remove id %s", argv[0]);
67 nb_errors++;
68 }
69 }
70 argc--;
71 argv++;
72 }
73
74 return nb_errors;
75}
76#endif /* IPCRM_LEGACY */
77
78
79int ipcrm_main(int argc, char **argv);
80int ipcrm_main(int argc, char **argv)
81{
82 int c;
83 int error = 0;
84
85 /* if the command is executed without parameters, do nothing */
86 if (argc == 1)
87 return 0;
88#if IPCRM_LEGACY
89 /* check to see if the command is being invoked in the old way if so
90 then run the old code. Valid commands are msg, shm, sem. */
91 {
92 type_id what = 0; /* silence gcc */
93 char w;
94
95 w=argv[1][0];
96 if ( ((w == 'm' && argv[1][1] == 's' && argv[1][2] == 'g')
97 || (argv[1][0] == 's'
98 && ((w=argv[1][1]) == 'h' || w == 'e')
99 && argv[1][2] == 'm')
100 ) && argv[1][3] == '\0'
101 ) {
102
103 if (argc < 3)
104 bb_show_usage();
105
106 if (w == 'h')
107 what = SHM;
108 else if (w == 'm')
109 what = MSG;
110 else if (w == 'e')
111 what = SEM;
112
113 if (remove_ids(what, argc-2, &argv[2]))
114 fflush_stdout_and_exit(1);
115 printf("resource(s) deleted\n");
116 return 0;
117 }
118 }
119#endif /* IPCRM_LEGACY */
120
121 /* process new syntax to conform with SYSV ipcrm */
122 while ((c = getopt(argc, argv, "q:m:s:Q:M:S:h?")) != -1) {
123 int result;
124 int id = 0;
125 int iskey = (isupper)(c);
126
127 /* needed to delete semaphores */
128 union semun arg;
129
130 arg.val = 0;
131
132 if ((c == '?') || (c == 'h')) {
133 bb_show_usage();
134 }
135
136 /* we don't need case information any more */
137 c = tolower(c);
138
139 /* make sure the option is in range: allowed are q, m, s */
140 if (c != 'q' && c != 'm' && c != 's') {
141 bb_show_usage();
142 }
143
144 if (iskey) {
145 /* keys are in hex or decimal */
146 key_t key = xstrtoul(optarg, 0);
147
148 if (key == IPC_PRIVATE) {
149 error++;
150 bb_error_msg("illegal key (%s)", optarg);
151 continue;
152 }
153
154 /* convert key to id */
155 id = ((c == 'q') ? msgget(key, 0) :
156 (c == 'm') ? shmget(key, 0, 0) : semget(key, 0, 0));
157
158 if (id < 0) {
159 const char *errmsg;
160
161 error++;
162 switch (errno) {
163 case EACCES:
164 errmsg = "permission denied for";
165 break;
166 case EIDRM:
167 errmsg = "already removed";
168 break;
169 case ENOENT:
170 errmsg = "invalid";
171 break;
172 default:
173 errmsg = "unknown error in";
174 break;
175 }
176 bb_error_msg("%s %s (%s)", errmsg, "key", optarg);
177 continue;
178 }
179 } else {
180 /* ids are in decimal */
181 id = xatoul(optarg);
182 }
183
184 result = ((c == 'q') ? msgctl(id, IPC_RMID, NULL) :
185 (c == 'm') ? shmctl(id, IPC_RMID, NULL) :
186 semctl(id, 0, IPC_RMID, arg));
187
188 if (result) {
189 const char *errmsg;
190 const char *const what = iskey ? "key" : "id";
191
192 error++;
193 switch (errno) {
194 case EACCES:
195 case EPERM:
196 errmsg = "permission denied for";
197 break;
198 case EINVAL:
199 errmsg = "invalid";
200 break;
201 case EIDRM:
202 errmsg = "already removed";
203 break;
204 default:
205 errmsg = "unknown error in";
206 break;
207 }
208 bb_error_msg("%s %s (%s)", errmsg, what, optarg);
209 continue;
210 }
211 }
212
213 /* print usage if we still have some arguments left over */
214 if (optind != argc) {
215 bb_show_usage();
216 }
217
218 /* exit value reflects the number of errors encountered */
219 return error;
220}
Note: See TracBrowser for help on using the repository browser.