diff options
Diffstat (limited to 'usr.sbin')
45 files changed, 216 insertions, 216 deletions
diff --git a/usr.sbin/sade/command.c b/usr.sbin/sade/command.c index 57f6213..5d132c4 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 980bc57..09209fd 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 48c10e4..14225fb 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 35a3e0e..3aeb539 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 2b77da0..636408a 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 891318d..a2ccbce 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 478c7cd..48f75f1 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 6e7f8e5..e4533734 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 7660258..649f1ad 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 3008e98..6811a91 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 f1b8066..49d68f9 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 5930d14..0d3791c 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 42da9c4..e18bcf8 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 2e55385..8f68a42 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 ef70a75..384e532 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 4ff9499..d2b9799 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 a3f9285..81c2b0f 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"); - + } } diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c index b67406a..dbb5fb8 100644 --- a/usr.sbin/sysinstall/cdrom.c +++ b/usr.sbin/sysinstall/cdrom.c @@ -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: cdrom.c,v 1.4 1995/05/28 07:05:21 phk Exp $ + * $Id: cdrom.c,v 1.5 1995/05/29 11:01:03 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -15,8 +15,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/sysinstall/command.c b/usr.sbin/sysinstall/command.c index 57f6213..5d132c4 100644 --- a/usr.sbin/sysinstall/command.c +++ b/usr.sbin/sysinstall/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/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 980bc57..09209fd 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/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/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c index 48c10e4..14225fb 100644 --- a/usr.sbin/sysinstall/devices.c +++ b/usr.sbin/sysinstall/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/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 35a3e0e..3aeb539 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/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/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index ad91eb8..f01c5b5 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dist.c,v 1.33 1995/05/29 13:37:42 jkh Exp $ + * $Id: dist.c,v 1.34 1995/05/29 14:38:31 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 @@ -268,7 +268,7 @@ distExtract(char *parent, Distribution *me) msgConfirm("Cannot load information file for %s distribution!\nPlease verify that your media is valid and try again.", dist); return FALSE; } - + if (isDebug()) msgDebug("Looking for attribute `pieces'\n"); tmp = attr_match(dist_attr, "pieces"); diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c index 2b77da0..636408a 100644 --- a/usr.sbin/sysinstall/dmenu.c +++ b/usr.sbin/sysinstall/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/sysinstall/dos.c b/usr.sbin/sysinstall/dos.c index 9cf2cd3..5bd31f0 100644 --- a/usr.sbin/sysinstall/dos.c +++ b/usr.sbin/sysinstall/dos.c @@ -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: dos.c,v 1.3 1995/05/28 03:04:54 jkh Exp $ + * $Id: dos.c,v 1.4 1995/05/29 11:01:11 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -15,8 +15,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/sysinstall/floppy.c b/usr.sbin/sysinstall/floppy.c index 865a635..bf9265a 100644 --- a/usr.sbin/sysinstall/floppy.c +++ b/usr.sbin/sysinstall/floppy.c @@ -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: floppy.c,v 1.4 1995/05/29 00:50:01 jkh Exp $ + * $Id: floppy.c,v 1.5 1995/05/29 11:01:13 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -15,8 +15,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 @@ -87,14 +87,14 @@ getRootFloppy(void) while (floppyDev == NULL || fd == -1) { Device **devs; int cnt; - + devs = deviceFind(NULL, DEVICE_TYPE_FLOPPY); cnt = deviceCount(devs); if (cnt == 1) floppyDev = devs[0]; else if (cnt > 1) { DMenu *menu; - + menu = deviceCreateMenu(&MenuMediaFloppy, DEVICE_TYPE_FLOPPY, floppyChoiceHook); menu->title = "Please insert the ROOT floppy"; dmenuOpenSimple(menu); @@ -125,7 +125,7 @@ mediaInitFloppy(Device *dev) return FALSE; } msgConfirm("Please insert media into %s and press return", dev->description); - msgDebug("initFloppy: mount floppy %s on /mnt\n", dev->devname); + msgDebug("initFloppy: mount floppy %s on /mnt\n", dev->devname); dosargs.fspec = dev->devname; if (mount(MOUNT_MSDOS, "/mnt", 0, (caddr_t)&dosargs) == -1) { msgConfirm("Error mounting floppy %s (%s) on /mnt : %s\n", dev->name, diff --git a/usr.sbin/sysinstall/ftp.c b/usr.sbin/sysinstall/ftp.c index 59060b6..99e064f 100644 --- a/usr.sbin/sysinstall/ftp.c +++ b/usr.sbin/sysinstall/ftp.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: ftp.c,v 1.11 1995/05/27 06:19:59 phk Exp $ + * $Id: ftp.c,v 1.12 1995/05/29 11:01:16 jkh Exp $ * */ @@ -44,7 +44,7 @@ debug(FTP_t ftp, const char *fmt, ...) #endif (void) vsnprintf(p+strlen(p), sizeof p - strlen(p), fmt, ap); va_end(ap); - + #ifdef STANDALONE_FTP write(ftp->fd_debug,p,strlen(p)); #else @@ -67,7 +67,7 @@ get_a_line(FTP_t ftp) { static char buf[BUFSIZ]; int i,j; - + for(i=0;i<BUFSIZ;) { j = read(ftp->fd_ctrl,buf+i,1); if (j != 1) @@ -89,7 +89,7 @@ get_a_number(FTP_t ftp, char **q) { char *p; int i = -1,j; - + while(1) { p = get_a_line(ftp); if (!(isdigit(p[0]) && isdigit(p[1]) && isdigit(p[2]))) @@ -97,8 +97,8 @@ get_a_number(FTP_t ftp, char **q) if (i == -1 && p[3] == '-') { i = atoi(p); continue; - } - if (p[3] != ' ' && p[3] != '\t') + } + if (p[3] != ' ' && p[3] != '\t') continue; j = atoi(p); if (i == -1) { @@ -127,12 +127,12 @@ cmd(FTP_t ftp, const char *fmt, ...) { char p[BUFSIZ]; int i; - + va_list ap; va_start(ap, fmt); (void) vsnprintf(p, sizeof p, fmt, ap); va_end(ap); - + debug(ftp, "send <%s>\n",p); strcat(p,"\r\n"); if (writes(ftp->fd_ctrl,p)) @@ -145,7 +145,7 @@ FTP_t FtpInit() { FTP_t ftp; - + ftp = malloc(sizeof *ftp); if (!ftp) return ftp; @@ -173,18 +173,18 @@ FtpOpen(FTP_t ftp, char *host, char *user, char *passwd) int s; unsigned long temp; int i; - + if (ftp->state != init) return botch(ftp,"FtpOpen","init"); - + if (!user) user = "ftp"; - + if (!passwd) passwd = "??@??(FreeBSD:libftp)"; /* XXX */ - + debug(ftp, "FtpOpen(ftp, %s, %s, %s)\n", host, user, passwd); - + temp = inet_addr(host); if (temp != INADDR_NONE) { @@ -202,33 +202,33 @@ FtpOpen(FTP_t ftp, char *host, char *user, char *passwd) ftp->addrtype = sin.sin_family = he->h_addrtype; bcopy(he->h_addr, (char *)&sin.sin_addr, he->h_length); } - + sin.sin_port = htons(21); - + if ((s = socket(ftp->addrtype, SOCK_STREAM, 0)) < 0) { debug(ftp, "Socket open failed: %s (%i)\n", strerror(errno), errno); return s; } - + if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) { debug(ftp,"Connection failed: %s (%i)\n", strerror(errno), errno); (void)close(s); return -1; } - + ftp->fd_ctrl = s; - + debug(ftp, "open (%d)\n",get_a_number(ftp,0)); - + i = cmd(ftp,"USER %s",user); - if (i >= 300 && i < 400) + if (i >= 300 && i < 400) i = cmd(ftp,"PASS %s",passwd); if (i >= 299) return -1; ftp->state = isopen; return 0; - + #if 0 fail: close(ftp->fd_ctrl); @@ -240,9 +240,9 @@ fail: void FtpClose(FTP_t ftp) { - if (ftp->state != isopen) + if (ftp->state != isopen) botch(ftp,"FtpClose","open"); - + debug(ftp, "FtpClose(ftp)\n"); writes(ftp->fd_ctrl,"QUIT\r\n"); close(ftp->fd_ctrl); ftp->fd_ctrl = -1; @@ -254,7 +254,7 @@ int FtpChdir(FTP_t ftp, char *dir) { int i; - if (ftp->state != isopen) + if (ftp->state != isopen) return botch(ftp,"FtpChdir","open"); i = cmd(ftp,"CWD %s",dir); return 0; @@ -267,9 +267,9 @@ FtpGet(FTP_t ftp, char *file) char *q; unsigned char addr[6]; struct sockaddr_in sin; - + debug(ftp, "FtpGet(ftp,%s)\n",file); - if (ftp->state != isopen) + if (ftp->state != isopen) return botch(ftp,"FtpGet","open"); if(ftp->binary) { i = cmd(ftp,"TYPE I"); @@ -294,13 +294,13 @@ FtpGet(FTP_t ftp, char *file) q++; addr[i] = strtol(q,&q,10); } - + sin.sin_family = ftp->addrtype; bcopy(addr, (char *)&sin.sin_addr, 4); bcopy(addr+4, (char *)&sin.sin_port, 2); debug(ftp, "Opening active socket to %s : %u\n", inet_ntoa(sin.sin_addr), htons(sin.sin_port)); - if ((s = socket(ftp->addrtype, SOCK_STREAM, 0)) < 0) + if ((s = socket(ftp->addrtype, SOCK_STREAM, 0)) < 0) return -1; debug(ftp, "Connecting to %s:%u\n", inet_ntoa(sin.sin_addr), htons(sin.sin_port)); @@ -309,7 +309,7 @@ FtpGet(FTP_t ftp, char *file) debug(ftp, "connect: %s (%d)\n", strerror(errno), errno); return -1; } - + i = cmd(ftp,"RETR %s",file); if (i > 299) return -1; @@ -324,7 +324,7 @@ FtpGet(FTP_t ftp, char *file) int FtpEOF(FTP_t ftp) { - if (ftp->state != xfer) + if (ftp->state != xfer) return botch(ftp,"FtpEOF","xfer"); debug(ftp, "FtpEOF(ftp)\n"); close(ftp->fd_xfer); ftp->fd_xfer = -1; @@ -336,16 +336,16 @@ FtpEOF(FTP_t ftp) /* main.c */ -int +int main(int argc, char **argv) { FTP_t ftp; int i; char c; - + ftp = FtpInit(); if (!ftp) err(1,"FtpInit()"); - + FtpDebug(ftp,1); i = FtpOpen(ftp, "ref.tfs.com", "ftp", "phk-libftp@"); if (i) err(1,"FtpOpen(%d)",i); diff --git a/usr.sbin/sysinstall/globals.c b/usr.sbin/sysinstall/globals.c index 891318d..a2ccbce 100644 --- a/usr.sbin/sysinstall/globals.c +++ b/usr.sbin/sysinstall/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/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 478c7cd..48f75f1 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/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/sysinstall/label.c b/usr.sbin/sysinstall/label.c index 6e7f8e5..e4533734 100644 --- a/usr.sbin/sysinstall/label.c +++ b/usr.sbin/sysinstall/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/sysinstall/main.c b/usr.sbin/sysinstall/main.c index 7660258..649f1ad 100644 --- a/usr.sbin/sysinstall/main.c +++ b/usr.sbin/sysinstall/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/sysinstall/media.c b/usr.sbin/sysinstall/media.c index 2d9ba18..03ec86b 100644 --- a/usr.sbin/sysinstall/media.c +++ b/usr.sbin/sysinstall/media.c @@ -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: media.c,v 1.22 1995/05/29 11:01:27 jkh Exp $ + * $Id: media.c,v 1.23 1995/05/30 05:13:21 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/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 3008e98..6811a91 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/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/sysinstall/misc.c b/usr.sbin/sysinstall/misc.c index f1b8066..49d68f9 100644 --- a/usr.sbin/sysinstall/misc.c +++ b/usr.sbin/sysinstall/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/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c index 5930d14..0d3791c 100644 --- a/usr.sbin/sysinstall/msg.c +++ b/usr.sbin/sysinstall/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/sysinstall/network.c b/usr.sbin/sysinstall/network.c index 2258162..950896e 100644 --- a/usr.sbin/sysinstall/network.c +++ b/usr.sbin/sysinstall/network.c @@ -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: network.c,v 1.4 1995/05/29 01:43:20 jkh Exp $ + * $Id: network.c,v 1.5 1995/05/29 11:01:34 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -15,8 +15,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/sysinstall/nfs.c b/usr.sbin/sysinstall/nfs.c index 044e959..f752aca 100644 --- a/usr.sbin/sysinstall/nfs.c +++ b/usr.sbin/sysinstall/nfs.c @@ -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: nfs.c,v 1.2 1995/05/29 11:01:35 jkh Exp $ + * $Id: nfs.c,v 1.3 1995/05/30 05:13:24 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/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index 42da9c4..e18bcf8 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.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/sysinstall/system.c b/usr.sbin/sysinstall/system.c index 2e55385..8f68a42 100644 --- a/usr.sbin/sysinstall/system.c +++ b/usr.sbin/sysinstall/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/sysinstall/tape.c b/usr.sbin/sysinstall/tape.c index ac288b5..a60f48f 100644 --- a/usr.sbin/sysinstall/tape.c +++ b/usr.sbin/sysinstall/tape.c @@ -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: tape.c,v 1.3 1995/05/28 03:05:04 jkh Exp $ + * $Id: tape.c,v 1.4 1995/05/29 11:01:40 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -15,8 +15,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/sysinstall/tcpip.c b/usr.sbin/sysinstall/tcpip.c index 22c3294..ea2cf3e 100644 --- a/usr.sbin/sysinstall/tcpip.c +++ b/usr.sbin/sysinstall/tcpip.c @@ -1,5 +1,5 @@ /* - * $Id: tcpip.c,v 1.27 1995/05/29 11:01:41 jkh Exp $ + * $Id: tcpip.c,v 1.28 1995/05/29 12:32:41 jkh Exp $ * * Copyright (c) 1995 * Gary J Palmer. All rights reserved. @@ -8,8 +8,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 @@ tcpOpenDialog(Device *devp) /* Initialise vars from previous device values */ if (devp->private) { DevInfo *di = (DevInfo *)devp->private; - + strcpy(ipaddr, di->ipaddr); strcpy(netmask, di->netmask); strcpy(extras, di->extras); @@ -265,7 +265,7 @@ tcpOpenDialog(Device *devp) last = obj; while (last->next) last = last->next; - + /* Find the first object in the list */ first = obj; while (first->prev) @@ -371,7 +371,7 @@ tcpOpenDialog(Device *devp) default: beep(); } - + /* BODGE ALERT! */ if (((tmp = index(hostname, '.')) != NULL) && (strlen(domainname)==0)) { strncpy(domainname, tmp + 1, strlen(tmp + 1)); @@ -384,7 +384,7 @@ tcpOpenDialog(Device *devp) dialog_clear(); refresh(); use_helpfile(NULL); - + /* We actually need to inform the rest of sysinstall about this data now - if the user hasn't selected cancel, save the stuff out to the environment via the variable_set layers */ diff --git a/usr.sbin/sysinstall/termcap.c b/usr.sbin/sysinstall/termcap.c index ef70a75..384e532 100644 --- a/usr.sbin/sysinstall/termcap.c +++ b/usr.sbin/sysinstall/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/sysinstall/ufs.c b/usr.sbin/sysinstall/ufs.c index 55a2701..9ad4a81 100644 --- a/usr.sbin/sysinstall/ufs.c +++ b/usr.sbin/sysinstall/ufs.c @@ -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: ufs.c,v 1.2 1995/05/27 23:39:35 phk Exp $ + * $Id: ufs.c,v 1.3 1995/05/29 11:01:42 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -15,8 +15,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/sysinstall/variable.c b/usr.sbin/sysinstall/variable.c index 4ff9499..d2b9799 100644 --- a/usr.sbin/sysinstall/variable.c +++ b/usr.sbin/sysinstall/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/sysinstall/wizard.c b/usr.sbin/sysinstall/wizard.c index a3f9285..81c2b0f 100644 --- a/usr.sbin/sysinstall/wizard.c +++ b/usr.sbin/sysinstall/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"); - + } } |
