diff options
Diffstat (limited to 'usr.sbin/sade')
-rw-r--r-- | usr.sbin/sade/command.c | 6 | ||||
-rw-r--r-- | usr.sbin/sade/config.c | 8 | ||||
-rw-r--r-- | usr.sbin/sade/devices.c | 8 | ||||
-rw-r--r-- | usr.sbin/sade/disks.c | 6 | ||||
-rw-r--r-- | usr.sbin/sade/dmenu.c | 6 | ||||
-rw-r--r-- | usr.sbin/sade/globals.c | 6 | ||||
-rw-r--r-- | usr.sbin/sade/install.c | 6 | ||||
-rw-r--r-- | usr.sbin/sade/label.c | 10 | ||||
-rw-r--r-- | usr.sbin/sade/main.c | 6 | ||||
-rw-r--r-- | usr.sbin/sade/menus.c | 12 | ||||
-rw-r--r-- | usr.sbin/sade/misc.c | 10 | ||||
-rw-r--r-- | usr.sbin/sade/msg.c | 6 | ||||
-rw-r--r-- | usr.sbin/sade/sade.h | 8 | ||||
-rw-r--r-- | usr.sbin/sade/system.c | 4 | ||||
-rw-r--r-- | usr.sbin/sade/termcap.c | 4 | ||||
-rw-r--r-- | usr.sbin/sade/variable.c | 6 | ||||
-rw-r--r-- | usr.sbin/sade/wizard.c | 32 |
17 files changed, 72 insertions, 72 deletions
diff --git a/usr.sbin/sade/command.c b/usr.sbin/sade/command.c index 57f621309dd7..5d132c45638d 100644 --- a/usr.sbin/sade/command.c +++ b/usr.sbin/sade/command.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: command.c,v 1.9 1995/05/20 13:24:33 jkh Exp $ + * $Id: command.c,v 1.10 1995/05/29 11:01:05 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -13,8 +13,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 980bc571365b..09209fd9abe4 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.13 1995/05/29 11:01:06 jkh Exp $ + * $Id: config.c,v 1.14 1995/05/29 13:37:41 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -13,8 +13,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -246,7 +246,7 @@ configSysconfig(void) lines[i] = (char *)malloc(strlen(v->name) + strlen(v->value) + 3); sprintf(lines[i], "%s=\"%s\"\n", v->name, v->value); } - + } } fp = fopen("/etc/sysconfig", "w"); diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c index 48c10e4e6c52..14225fbb9edf 100644 --- a/usr.sbin/sade/devices.c +++ b/usr.sbin/sade/devices.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: devices.c,v 1.33 1995/05/28 09:31:31 jkh Exp $ + * $Id: devices.c,v 1.34 1995/05/29 11:01:08 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -13,8 +13,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -282,7 +282,7 @@ deviceGetAll(void) end = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len); for (ifptr = ifc.ifc_req; ifptr < end; ifptr++) { /* If it's not a link entry, forget it */ - if (ifptr->ifr_ifru.ifru_addr.sa_family != AF_LINK) + if (ifptr->ifr_ifru.ifru_addr.sa_family != AF_LINK) continue; /* Eliminate network devices that don't make sense */ if (!strncmp(ifptr->ifr_name, "tun", 3) diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index 35a3e0e27c38..3aeb539bb1ef 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.28 1995/05/25 18:48:23 jkh Exp $ + * $Id: disks.c,v 1.29 1995/05/28 20:28:09 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -13,8 +13,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the diff --git a/usr.sbin/sade/dmenu.c b/usr.sbin/sade/dmenu.c index 2b77da09280d..636408a6b793 100644 --- a/usr.sbin/sade/dmenu.c +++ b/usr.sbin/sade/dmenu.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: dmenu.c,v 1.9 1995/05/17 14:39:41 jkh Exp $ + * $Id: dmenu.c,v 1.10 1995/05/24 17:49:13 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -13,8 +13,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the diff --git a/usr.sbin/sade/globals.c b/usr.sbin/sade/globals.c index 891318d93d5b..a2ccbcef8414 100644 --- a/usr.sbin/sade/globals.c +++ b/usr.sbin/sade/globals.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: globals.c,v 1.7 1995/05/24 22:37:41 jkh Exp $ + * $Id: globals.c,v 1.8 1995/05/25 18:48:25 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -13,8 +13,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 478c7cd96dd4..48f75f1b872d 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.68 1995/05/29 13:37:43 jkh Exp $ + * $Id: install.c,v 1.69 1995/05/30 05:50:53 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -13,8 +13,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c index 6e7f8e59c4ea..e4533734bd4c 100644 --- a/usr.sbin/sade/label.c +++ b/usr.sbin/sade/label.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: label.c,v 1.29 1995/05/28 23:12:06 jkh Exp $ + * $Id: label.c,v 1.30 1995/05/29 00:50:03 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -13,8 +13,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -181,7 +181,7 @@ new_part(char *mpoint, Boolean newfs, u_long size) return ret; for (target = size; target; target--) { for (divisor = 4096 ; divisor > 1023; divisor--) { - if (!(target % divisor)) { + if (!(target % divisor)) { sprintf(ret->newfs_cmd + strlen(ret->newfs_cmd), " -u %ld",divisor); return ret; } @@ -549,7 +549,7 @@ diskLabelEditor(char *str) safe_free(p); } else { tmp->private = p; - } + } tmp->private_free = safe_free; record_label_chunks(); } diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c index 7660258fc11a..649f1ad7f516 100644 --- a/usr.sbin/sade/main.c +++ b/usr.sbin/sade/main.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: main.c,v 1.10 1995/05/24 17:49:17 jkh Exp $ + * $Id: main.c,v 1.11 1995/05/28 09:31:35 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -13,8 +13,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 3008e982d7f0..6811a91b9145 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.39 1995/05/29 11:58:16 jkh Exp $ + * $Id: menus.c,v 1.40 1995/05/30 05:13:23 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -13,8 +13,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -206,7 +206,7 @@ To specify a URL not in this list, chose \"other\".", DMENU_SET_VARIABLE, "ftp=ftp://ftp.physics.usyd.edu.au/FreeBSD/2.0.5-ALPHA", 0, 0 }, { "Finland", "nic.funet.fi", DMENU_SET_VARIABLE, "ftp=ftp://nic.funet.fi/pub/unix/FreeBSD/2.0.5-ALPHA", 0, 0 }, - { "France", "ftp.ibp.fr", + { "France", "ftp.ibp.fr", DMENU_SET_VARIABLE, "ftp=ftp://ftp.ibp.fr/pub/FreeBSD/2.0.5-ALPHA", 0, 0 }, { "Germany", "ftp.uni-duisburg.de", DMENU_SET_VARIABLE, "ftp=ftp://ftp.uni-duisburg.de/pub/unix/FreeBSD/2.0.5-ALPHA", 0, }, @@ -214,7 +214,7 @@ To specify a URL not in this list, chose \"other\".", DMENU_SET_VARIABLE, "ftp=ftp://orgchem.weizmann.ac.il/pub/FreeBSD-2.0.5-ALPHA", 0, 0 }, { "Japan", "ftp.sra.co.jp", DMENU_SET_VARIABLE, "ftp=ftp://ftp.sra.co.jp/pub/os/FreeBSD/distribution/2.0.5-ALPHA", 0, 0 }, - { "Japan #2", "ftp.mei.co.jp", + { "Japan #2", "ftp.mei.co.jp", DMENU_SET_VARIABLE, "ftp=ftp://ftp.mei.co.jp/free/PC-UNIX/FreeBSD/2.0.5-ALPHA", 0, 0 }, { "Japan #3", "ftp.waseda.ac.jp", DMENU_SET_VARIABLE, "ftp=ftp://ftp.waseda.ac.jp/pub/FreeBSD/2.0.5-ALPHA", 0, 0 }, @@ -430,7 +430,7 @@ When you're finished, select Cancel.", "XF86.hlp", { { "Basic", "Basic component menu (required)", DMENU_SUBMENU, &MenuXF86SelectCore, 0, 0 }, - { "Server", "X server menu", + { "Server", "X server menu", DMENU_SUBMENU, &MenuXF86SelectServer, 0, 0 }, { "Fonts", "Font set menu", DMENU_SUBMENU, &MenuXF86SelectFonts, 0, 0 }, diff --git a/usr.sbin/sade/misc.c b/usr.sbin/sade/misc.c index f1b8066ca986..49d68f9a0f1b 100644 --- a/usr.sbin/sade/misc.c +++ b/usr.sbin/sade/misc.c @@ -1,7 +1,7 @@ /* * Miscellaneous support routines.. * - * $Id: misc.c,v 1.9 1995/05/25 01:22:19 jkh Exp $ + * $Id: misc.c,v 1.10 1995/05/29 11:01:31 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -10,8 +10,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -234,7 +234,7 @@ Mount(char *mountp, void *dev) return 1; } if (isDebug()) - msgDebug("mount %s %s\n", device, mountpoint); + msgDebug("mount %s %s\n", device, mountpoint); bzero(&ufsargs, sizeof(ufsargs)); ufsargs.fspec = device; if (mount(MOUNT_UFS, mountpoint, 0, (caddr_t)&ufsargs) == -1) { @@ -265,7 +265,7 @@ Mount_DOS(char *mountp, void *dev) msgConfirm("Unable to make directory mountpoint for %s!", mountpoint); return 1; } - msgDebug("mount %s %s\n", device, mountpoint); + msgDebug("mount %s %s\n", device, mountpoint); ufsargs.fspec = device; if (mount(MOUNT_MSDOS, mountpoint, 0, (caddr_t)&ufsargs) == -1) { msgConfirm("Error mounting %s on %s : %s\n", device, mountpoint, strerror(errno)); diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c index 5930d14029c4..0d3791c96f7d 100644 --- a/usr.sbin/sade/msg.c +++ b/usr.sbin/sade/msg.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: msg.c,v 1.26 1995/05/29 01:43:18 jkh Exp $ + * $Id: msg.c,v 1.27 1995/05/29 11:01:32 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -13,8 +13,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index 42da9c44cee5..e18bcf8012fc 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.39 1995/05/28 09:31:39 jkh Exp $ + * $Id: sysinstall.h,v 1.40 1995/05/29 11:01:37 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -13,8 +13,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -215,7 +215,7 @@ typedef struct _devPriv { extern int DebugFD; /* Where diagnostic output goes */ extern Boolean OnCDROM; /* Are we running off of a CDROM? */ extern Boolean OnSerial; /* Are we on a serial console? */ -extern Boolean SystemWasInstalled; /* Did we install it? */ +extern Boolean SystemWasInstalled; /* Did we install it? */ extern Boolean RunningAsInit; /* Are we running stand-alone? */ extern Boolean DialogActive; /* Is the dialog() stuff up? */ extern Boolean ColorDisplay; /* Are we on a color display? */ diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c index 2e5538508789..8f68a42b5f27 100644 --- a/usr.sbin/sade/system.c +++ b/usr.sbin/sade/system.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: system.c,v 1.41 1995/05/29 02:13:31 phk Exp $ + * $Id: system.c,v 1.42 1995/05/29 11:01:39 jkh Exp $ * * Jordan Hubbard * @@ -217,7 +217,7 @@ systemHelpFile(char *file, char *buf) strcpy(oldfile, buf); return buf; } - } + } /* Fall back to normal imperialistic mode :-) */ cp = "en_US.ISO8859-1"; snprintf(buf, FILENAME_MAX, "%s/%s", cp, file); diff --git a/usr.sbin/sade/termcap.c b/usr.sbin/sade/termcap.c index ef70a75bc3a9..384e5321abc0 100644 --- a/usr.sbin/sade/termcap.c +++ b/usr.sbin/sade/termcap.c @@ -1,8 +1,8 @@ /* * Copyright (c) 1994, Paul Richards. - * + * * All rights reserved. - * + * * This software may be used, modified, copied, distributed, and sold, in both * source and binary form provided that the above copyright and these terms * are retained, verbatim, as the first lines of this file. Under no diff --git a/usr.sbin/sade/variable.c b/usr.sbin/sade/variable.c index 4ff9499b82f4..d2b979916773 100644 --- a/usr.sbin/sade/variable.c +++ b/usr.sbin/sade/variable.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: variable.c,v 1.3 1995/05/26 20:45:20 jkh Exp $ + * $Id: variable.c,v 1.4 1995/05/27 10:47:44 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -13,8 +13,8 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * verbatim and that no modifications are made prior to this + * notice, this list of conditions and the following disclaimer, + * verbatim and that no modifications are made prior to this * point in the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the diff --git a/usr.sbin/sade/wizard.c b/usr.sbin/sade/wizard.c index a3f9285e53d9..81c2b0fa4c65 100644 --- a/usr.sbin/sade/wizard.c +++ b/usr.sbin/sade/wizard.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: wizard.c,v 1.3 1995/05/17 14:40:00 jkh Exp $ + * $Id: wizard.c,v 1.4 1995/05/20 10:33:14 jkh Exp $ * */ @@ -86,10 +86,10 @@ Scan_Disk(Disk *d) char device[64]; u_long l; int i,j,fd; - + strcpy(device,"/dev/r"); strcat(device,d->name); - + fd = open(device,O_RDWR); if (fd < 0) { msgWarn("open(%s) failed", device); @@ -108,9 +108,9 @@ Scan_Disk(Disk *d) printf(".%lu\nG: %lu.",l-1,l); fflush(stdout); } - i = j; + i = j; } - } + } close(fd); } @@ -123,7 +123,7 @@ slice_wizard(Disk *d) char *p,*q=0; char **cp,*cmds[200]; int ncmd,i; - + sprintf(myprompt,"%s> ", d->name); while(1) { printf("--==##==--\n"); @@ -158,41 +158,41 @@ slice_wizard(Disk *d) All_FreeBSD(d); continue; } - if (!strcasecmp(*cmds,"bios") && ncmd == 4) { + if (!strcasecmp(*cmds,"bios") && ncmd == 4) { Set_Bios_Geom(d, strtol(cmds[1],0,0), strtol(cmds[2],0,0), strtol(cmds[3],0,0)); continue; } - if (!strcasecmp(*cmds,"phys") && ncmd == 4) { + if (!strcasecmp(*cmds,"phys") && ncmd == 4) { d = Set_Phys_Geom(d, strtol(cmds[1],0,0), strtol(cmds[2],0,0), strtol(cmds[3],0,0)); continue; } - if (!strcasecmp(*cmds,"collapse")) { + if (!strcasecmp(*cmds,"collapse")) { if (cmds[1]) while (Collapse_Chunk(d, (struct chunk *)strtol(cmds[1],0,0))) ; - else + else Collapse_Disk(d); continue; - } - if (!strcasecmp(*cmds,"list")) { + } + if (!strcasecmp(*cmds,"list")) { cp = Disk_Names(); printf("Disks:"); for(i=0;cp[i];i++) { printf(" %s",cp[i]); free(cp[i]); - } + } free(cp); continue; } - if (!strcasecmp(*cmds,"create") && ncmd == 6) { - + if (!strcasecmp(*cmds,"create") && ncmd == 6) { + printf("Create=%d\n", Create_Chunk(d, strtol(cmds[1],0,0), @@ -260,6 +260,6 @@ slice_wizard(Disk *d) for(i=0;chunk_n[i];i++) printf("%d = %s%s",i,chunk_n[i],i == 4 ? "\n\t" : " "); printf("\n"); - + } } |