aboutsummaryrefslogtreecommitdiff
path: root/runit
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-03 21:00:06 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-03 21:00:06 +0000
commit63adc7384791548741e3a2afbee1be40d99fe9d2 (patch)
treeedb58560b444979051b42ab7f0c0c718f7459754 /runit
parent1fa12c6ebcb25e2924778bcbaae4bea1af7b7e6a (diff)
downloadbusybox-w32-63adc7384791548741e3a2afbee1be40d99fe9d2.tar.gz
busybox-w32-63adc7384791548741e3a2afbee1be40d99fe9d2.tar.bz2
busybox-w32-63adc7384791548741e3a2afbee1be40d99fe9d2.zip
getopt_ulflags -> getopt32.
It is impossible to formulate sane ABI based on size of ulong because it can be 32-bit or 64-bit. Basically it means that you cannot portably use more that 32 option chars in one call anyway... Make it explicit. git-svn-id: svn://busybox.net/trunk/busybox@16305 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'runit')
-rw-r--r--runit/chpst.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/runit/chpst.c b/runit/chpst.c
index 11ee3d733..ced28387d 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -238,7 +238,7 @@ int chpst_main(int argc, char **argv)
238 238
239 { 239 {
240 char *m,*d,*o,*p,*f,*c,*r,*t,*n; 240 char *m,*d,*o,*p,*f,*c,*r,*t,*n;
241 option_mask = bb_getopt_ulflags(argc, argv, "u:U:e:m:d:o:p:f:c:r:t:/:n:vP012", 241 option_mask = getopt32(argc, argv, "u:U:e:m:d:o:p:f:c:r:t:/:n:vP012",
242 &set_user,&env_user,&env_dir, 242 &set_user,&env_user,&env_dir,
243 &m,&d,&o,&p,&f,&c,&r,&t,&root,&n); 243 &m,&d,&o,&p,&f,&c,&r,&t,&root,&n);
244 // if (option_mask & 0x1) // -u 244 // if (option_mask & 0x1) // -u
@@ -324,7 +324,7 @@ static void envdir(int argc, char **argv)
324static void softlimit(int argc, char **argv) 324static void softlimit(int argc, char **argv)
325{ 325{
326 char *a,*c,*d,*f,*l,*m,*o,*p,*r,*s,*t; 326 char *a,*c,*d,*f,*l,*m,*o,*p,*r,*s,*t;
327 option_mask = bb_getopt_ulflags(argc, argv, "a:c:d:f:l:m:o:p:r:s:t:", 327 option_mask = getopt32(argc, argv, "a:c:d:f:l:m:o:p:r:s:t:",
328 &a,&c,&d,&f,&l,&m,&o,&p,&r,&s,&t); 328 &a,&c,&d,&f,&l,&m,&o,&p,&r,&s,&t);
329 if (option_mask & 0x001) limita = bb_xgetularg10(a); // -a 329 if (option_mask & 0x001) limita = bb_xgetularg10(a); // -a
330 if (option_mask & 0x002) limitc = bb_xgetularg10(c); // -c 330 if (option_mask & 0x002) limitc = bb_xgetularg10(c); // -c