Date: Sun, 11 May 2008 22:09:11 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 141480 for review Message-ID: <200805112209.m4BM9BGi024381@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=141480 Change 141480 by sam@sam_ebb on 2008/05/11 22:08:34 IFC @ 141476 Affected files ... .. //depot/projects/vap/kerberos5/lib/libkrb5/Makefile#4 integrate .. //depot/projects/vap/lib/libthr/arch/mips/include/pthread_md.h#1 branch .. //depot/projects/vap/lib/libthr/arch/mips/mips/pthread_md.c#1 branch .. //depot/projects/vap/release/pc98/fixit_crunch.conf#3 integrate .. //depot/projects/vap/share/man/man4/snd_hda.4#4 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#15 integrate .. //depot/projects/vap/sys/dev/ata/ata-disk.c#10 integrate .. //depot/projects/vap/sys/dev/ata/ata-lowlevel.c#10 integrate .. //depot/projects/vap/sys/dev/ata/atapi-cd.c#8 integrate .. //depot/projects/vap/sys/dev/ata/atapi-fd.c#8 integrate .. //depot/projects/vap/sys/dev/ata/atapi-tape.c#8 integrate .. //depot/projects/vap/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/vap/sys/vm/memguard.c#5 integrate .. //depot/projects/vap/usr.sbin/sade/config.c#3 integrate .. //depot/projects/vap/usr.sbin/sade/label.c#4 integrate .. //depot/projects/vap/usr.sbin/sade/main.c#3 integrate .. //depot/projects/vap/usr.sbin/sade/sade.h#3 integrate .. //depot/projects/vap/usr.sbin/sade/system.c#3 integrate .. //depot/projects/vap/usr.sbin/sade/termcap.c#3 integrate .. //depot/projects/vap/usr.sbin/sade/variable.c#3 integrate .. //depot/projects/vap/usr.sbin/sysinstall/config.c#3 integrate .. //depot/projects/vap/usr.sbin/sysinstall/label.c#3 integrate .. //depot/projects/vap/usr.sbin/sysinstall/main.c#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/sysinstall.h#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/system.c#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/variable.c#3 integrate Differences ... ==== //depot/projects/vap/kerberos5/lib/libkrb5/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/lib/libkrb5/Makefile,v 1.18 2008/05/07 13:53:05 dfr Exp $ +# $FreeBSD: src/kerberos5/lib/libkrb5/Makefile,v 1.20 2008/05/11 10:32:37 dfr Exp $ LIB= krb5 VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map @@ -128,10 +128,6 @@ krb5_auth_context.3 krb5_auth_setkeytype.3 \ krb5_auth_context.3 krb5_auth_setlocalseqnumber.3 \ krb5_auth_context.3 krb5_auth_setremoteseqnumber.3 \ - krb5_build_principal.3 krb5_build_principal_ext.3 \ - krb5_build_principal.3 krb5_build_principal_va.3 \ - krb5_build_principal.3 krb5_build_principal_va_ext.3 \ - krb5_build_principal.3 krb5_make_principal.3 \ krb5_ccache.3 krb5_cc_close.3 \ krb5_ccache.3 krb5_cc_copy_cache.3 \ krb5_ccache.3 krb5_cc_cursor.3 \ @@ -217,12 +213,39 @@ krb5_openlog.3 krb5_log_msg.3 \ krb5_openlog.3 krb5_vlog.3 \ krb5_openlog.3 krb5_vlog_msg.3 \ - krb5_principal_get_realm.3 krb5_principal_get_comp_string.3 \ + krb5_principal.3 krb5_get_default_principal.3 \ + krb5_principal.3 krb5_build_principal.3 \ + krb5_principal.3 krb5_build_principal_ext.3 \ + krb5_principal.3 krb5_build_principal_va.3 \ + krb5_principal.3 krb5_build_principal_va_ext.3 \ + krb5_principal.3 krb5_copy_principal.3 \ + krb5_principal.3 krb5_free_principal.3 \ + krb5_principal.3 krb5_make_principal.3 \ + krb5_principal.3 krb5_parse_name.3 \ + krb5_principal.3 krb5_parse_name_flags.3 \ + krb5_principal.3 krb5_parse_nametype.3 \ + krb5_principal.3 krb5_princ_realm.3 \ + krb5_principal.3 krb5_princ_set_realm.3 \ + krb5_principal.3 krb5_principal_compare.3 \ + krb5_principal.3 krb5_principal_compare_any_realm.3 \ + krb5_principal.3 krb5_principal_get_comp_string.3 \ + krb5_principal.3 krb5_principal_get_realm.3 \ + krb5_principal.3 krb5_principal_get_type.3 \ + krb5_principal.3 krb5_principal_match.3 \ + krb5_principal.3 krb5_principal_set_type.3 \ + krb5_principal.3 krb5_realm_compare.3 \ + krb5_principal.3 krb5_sname_to_principal.3 \ + krb5_principal.3 krb5_sock_to_principal.3 \ + krb5_principal.3 krb5_unparse_name.3 \ + krb5_principal.3 krb5_unparse_name_flags.3 \ + krb5_principal.3 krb5_unparse_name_fixed.3 \ + krb5_principal.3 krb5_unparse_name_fixed_flags.3 \ + krb5_principal.3 krb5_unparse_name_fixed_short.3 \ + krb5_principal.3 krb5_unparse_name_short.3 \ krb5_set_default_realm.3 krb5_free_host_realm.3 \ krb5_set_default_realm.3 krb5_get_default_realm.3 \ krb5_set_default_realm.3 krb5_get_default_realms.3 \ krb5_set_default_realm.3 krb5_get_host_realm.3 \ - krb5_sname_to_principal.3 krb5_sock_to_principal.3 \ krb5_timeofday.3 krb5_us_timeofday.3 \ krb5_verify_user.3 krb5_verify_opt_init.3 \ krb5_verify_user.3 krb5_verify_opt_set_flags.3 \ ==== //depot/projects/vap/release/pc98/fixit_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.15 2007/05/22 11:32:55 nyan Exp $ +# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.16 2008/05/11 14:25:24 nyan Exp $ buildopts -DRELEASE_CRUNCH @@ -9,6 +9,7 @@ progs dd progs df progs echo +progs ed progs expr progs kill progs ln @@ -39,9 +40,6 @@ srcdirs /usr/src/usr.bin progs ftp progs telnet -progs vi -ln vi view -ln vi ex srcdirs /usr/src/usr.sbin progs chown ==== //depot/projects/vap/share/man/man4/snd_hda.4#4 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.13 2008/01/04 12:57:06 gabor Exp $ +.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.14 2008/05/11 06:40:04 joel Exp $ .\" -.Dd July 14, 2007 +.Dd May 11, 2008 .Dt SND_HDA 4 .Os .Sh NAME @@ -160,6 +160,10 @@ .It nVidia MCP65B .It +nVidia MCP67A +.It +nVidia MCP67B +.It SiS 966 .It VIA VT8251/8237A @@ -175,6 +179,8 @@ .It Analog Devices AD1983 .It +Analog Devices AD1984 +.It Analog Devices AD1986A .It Analog Devices AD1988 @@ -209,6 +215,8 @@ .It Realtek ALC888 .It +Sigmatel STAC9205 +.It Sigmatel STAC9220 .It Sigmatel STAC9220D/9223D ==== //depot/projects/vap/sys/amd64/amd64/pmap.c#15 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.616 2008/05/09 16:48:06 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.617 2008/05/11 20:33:46 alc Exp $"); /* * Manages physical address maps. @@ -4480,11 +4480,12 @@ { vm_offset_t superpage_offset; + if (size < NBPDR) + return; if (object != NULL && (object->flags & OBJ_COLORED) != 0) offset += ptoa(object->pg_color); superpage_offset = offset & PDRMASK; - if (size < superpage_offset || - size - superpage_offset < NBPDR || + if (size - ((NBPDR - superpage_offset) & PDRMASK) < NBPDR || (*addr & PDRMASK) == superpage_offset) return; if ((*addr & PDRMASK) < superpage_offset) ==== //depot/projects/vap/sys/dev/ata/ata-disk.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.210 2008/04/17 12:29:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.211 2008/05/08 17:55:44 grehan Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -125,7 +125,7 @@ adp->disk->d_dump = ad_dump; adp->disk->d_name = "ad"; adp->disk->d_drv1 = dev; - adp->disk->d_maxsize = ch->dma.max_iosize; + adp->disk->d_maxsize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS; adp->disk->d_sectorsize = DEV_BSIZE; adp->disk->d_mediasize = DEV_BSIZE * (off_t)adp->total_secs; adp->disk->d_fwsectors = adp->sectors; ==== //depot/projects/vap/sys/dev/ata/ata-lowlevel.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.83 2008/04/17 12:29:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.84 2008/05/08 17:55:44 grehan Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -213,7 +213,9 @@ printf("ata_begin_transaction OOPS!!!\n"); begin_finished: - ch->dma.unload(request); + if (ch->dma.unload) { + ch->dma.unload(request); + } return ATA_OP_FINISHED; begin_continue: ==== //depot/projects/vap/sys/dev/ata/atapi-cd.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.199 2008/04/17 12:29:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.200 2008/05/08 17:55:44 grehan Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -906,8 +906,11 @@ { struct ata_channel *ch = device_get_softc(device_get_parent(dev)); struct acd_softc *cdp = device_get_ivars(dev); + uint32_t max_iosize; - cdp->iomax = min(ch->dma.max_iosize, 65534); + max_iosize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS; + + cdp->iomax = min(max_iosize, 65534); } static void ==== //depot/projects/vap/sys/dev/ata/atapi-fd.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.114 2008/04/17 12:29:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.115 2008/05/08 17:55:44 grehan Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -105,7 +105,7 @@ fdp->disk->d_ioctl = afd_ioctl; fdp->disk->d_name = "afd"; fdp->disk->d_drv1 = dev; - fdp->disk->d_maxsize = ch->dma.max_iosize; + fdp->disk->d_maxsize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS; fdp->disk->d_unit = device_get_unit(dev); disk_create(fdp->disk, DISK_VERSION); return 0; ==== //depot/projects/vap/sys/dev/ata/atapi-tape.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.107 2008/04/17 12:29:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.108 2008/05/08 17:55:44 grehan Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -142,7 +142,7 @@ UID_ROOT, GID_OPERATOR, 0640, "ast%d", device_get_unit(dev)); device->si_drv1 = dev; - device->si_iosize_max = ch->dma.max_iosize; + device->si_iosize_max = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS; stp->dev1 = device; device = make_dev(&ast_cdevsw, 2 * device_get_unit(dev) + 1, UID_ROOT, GID_OPERATOR, 0640, "nast%d", ==== //depot/projects/vap/sys/i386/i386/pmap.c#14 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.618 2008/05/09 16:48:06 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.619 2008/05/11 20:33:47 alc Exp $"); /* * Manages physical address maps. @@ -4608,11 +4608,12 @@ { vm_offset_t superpage_offset; + if (size < NBPDR) + return; if (object != NULL && (object->flags & OBJ_COLORED) != 0) offset += ptoa(object->pg_color); superpage_offset = offset & PDRMASK; - if (size < superpage_offset || - size - superpage_offset < NBPDR || + if (size - ((NBPDR - superpage_offset) & PDRMASK) < NBPDR || (*addr & PDRMASK) == superpage_offset) return; if ((*addr & PDRMASK) < superpage_offset) ==== //depot/projects/vap/sys/vm/memguard.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/vm/memguard.c,v 1.6 2005/12/30 11:45:07 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/memguard.c,v 1.7 2008/05/10 23:39:27 alc Exp $"); /* * MemGuard is a simple replacement allocator for debugging only @@ -174,7 +174,7 @@ size *= PAGE_SIZE; memguard_map = kmem_suballoc(parent_map, (vm_offset_t *)&base, - (vm_offset_t *)&limit, (vm_size_t)size); + (vm_offset_t *)&limit, (vm_size_t)size, FALSE); memguard_map->system_map = 1; memguard_mapsize = size; memguard_mapused = 0; ==== //depot/projects/vap/usr.sbin/sade/config.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/usr.sbin/sade/config.c,v 1.240 2006/08/08 13:45:46 delphij Exp $ + * $FreeBSD: src/usr.sbin/sade/config.c,v 1.242 2008/05/11 17:23:57 obrien Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -181,8 +181,8 @@ return DITEM_SUCCESS; else { msgConfirm("Attempting to rebuild your /etc/fstab file. Warning: If you had\n" - "any CD devices in use before running sysinstall then they may NOT\n" - "be found by this run!"); + "any CD devices in use before running %s then they may NOT\n" + "be found by this run!", ProgName); } devs = deviceFind(NULL, DEVICE_TYPE_DISK); ==== //depot/projects/vap/usr.sbin/sade/label.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/usr.sbin/sade/label.c,v 1.156 2008/05/05 06:31:41 mtm Exp $ + * $FreeBSD: src/usr.sbin/sade/label.c,v 1.158 2008/05/11 17:23:57 obrien Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -1276,7 +1276,7 @@ if (!variable_cmp(DISK_LABELLED, "written")) { msgConfirm("You've already written out your changes - if you\n" "wish to overwrite them, you'll have to restart\n" - "sade first."); + "%s first.", ProgName); } else if (!msgNoYes("WARNING: You are about to modify an EXISTING\n" "installation.\n\n" ==== //depot/projects/vap/usr.sbin/sade/main.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/usr.sbin/sade/main.c,v 1.80 2007/07/04 00:00:41 scf Exp $ + * $FreeBSD: src/usr.sbin/sade/main.c,v 1.81 2008/05/11 17:23:57 obrien Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -34,6 +34,7 @@ #include <sys/fcntl.h> const char *StartName; /* Initial contents of argv[0] */ +const char *ProgName = "sade"; int main(int argc, char **argv) ==== //depot/projects/vap/usr.sbin/sade/sade.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/sade/sade.h,v 1.277 2006/08/09 11:25:10 netchild Exp $ + * $FreeBSD: src/usr.sbin/sade/sade.h,v 1.278 2008/05/11 17:23:57 obrien Exp $ */ #ifndef _SADE_H_INCLUDE @@ -278,6 +278,7 @@ extern DMenu MenuMain; /* New main menu */ extern DMenu MenuDiskDevices; /* Disk type devices */ extern const char * StartName; /* Which name we were started as */ +extern const char * ProgName; /* Program's proper name */ /* Important chunks. */ extern Chunk *HomeChunk; ==== //depot/projects/vap/usr.sbin/sade/system.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/usr.sbin/sade/system.c,v 1.131 2006/08/09 09:12:01 netchild Exp $ + * $FreeBSD: src/usr.sbin/sade/system.c,v 1.133 2008/05/11 17:23:57 obrien Exp $ * * Jordan Hubbard * @@ -233,10 +233,12 @@ snprintf(buf, FILENAME_MAX, "/stand/help/%s.TXT", file); if (file_readable(buf)) return expand(buf); - snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/sade/help/%s.hlp", file); + snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/%s/help/%s.hlp", ProgName, + file); if (file_readable(buf)) return buf; - snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/sade/help/%s.TXT", file); + snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/%s/help/%s.TXT", ProgName, + file); if (file_readable(buf)) return buf; return NULL; ==== //depot/projects/vap/usr.sbin/sade/termcap.c#3 (text+ko) ==== @@ -10,7 +10,7 @@ * software, nor does the author assume any responsibility for damages * incurred with its use. * - * $FreeBSD: src/usr.sbin/sade/termcap.c,v 1.35 2007/03/06 09:32:41 kevlo Exp $ + * $FreeBSD: src/usr.sbin/sade/termcap.c,v 1.36 2008/05/11 07:13:08 obrien Exp $ */ #include "sade.h" @@ -45,7 +45,7 @@ stat = ioctl(STDERR_FILENO, GIO_COLOR, &ColorDisplay); if (isDebug()) - DebugFD = open("sysinstall.debug", O_WRONLY|O_CREAT|O_TRUNC, 0644); + DebugFD = open("sade.debug", O_WRONLY|O_CREAT|O_TRUNC, 0644); else DebugFD = -1; if (DebugFD < 0) ==== //depot/projects/vap/usr.sbin/sade/variable.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/usr.sbin/sade/variable.c,v 1.42 2007/07/04 00:00:41 scf Exp $ + * $FreeBSD: src/usr.sbin/sade/variable.c,v 1.44 2008/05/11 17:23:57 obrien Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -238,12 +238,12 @@ Variable *vp; if (isDebug()) - msgDebug("Writing sysinstall variables to file..\n"); + msgDebug("Writing %s variables to file..\n", ProgName); - fp = fopen("/etc/sysinstall.vars", "w"); + fp = fopen("/etc/sade.vars", "w"); if (!fp) { - msgConfirm("Unable to write to /etc/sysinstall.vars: %s", - strerror(errno)); + msgConfirm("Unable to write to /etc/%s.vars: %s", + ProgName, strerror(errno)); return DITEM_FAILURE; } ==== //depot/projects/vap/usr.sbin/sysinstall/config.c#3 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/config.c,v 1.243 2007/10/30 05:03:37 kensmith Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/config.c,v 1.245 2008/05/11 17:23:56 obrien Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -187,8 +187,8 @@ return DITEM_SUCCESS; else { msgConfirm("Attempting to rebuild your /etc/fstab file. Warning: If you had\n" - "any CD devices in use before running sysinstall then they may NOT\n" - "be found by this run!"); + "any CD devices in use before running %s then they may NOT\n" + "be found by this run!", ProgName); } } ==== //depot/projects/vap/usr.sbin/sysinstall/label.c#3 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/label.c,v 1.153 2006/11/28 11:48:34 nyan Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/label.c,v 1.155 2008/05/11 17:23:56 obrien Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -1281,7 +1281,7 @@ if (!variable_cmp(DISK_LABELLED, "written")) { msgConfirm("You've already written out your changes - if you\n" "wish to overwrite them, you'll have to restart\n" - "sysinstall first."); + "%s first.", ProgName); } else if (!msgNoYes("WARNING: This should only be used when modifying an EXISTING\n" "installation. If you are installing FreeBSD for the first time\n" ==== //depot/projects/vap/usr.sbin/sysinstall/main.c#4 (text+ko) ==== @@ -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. * - * $FreeBSD: src/usr.sbin/sysinstall/main.c,v 1.79 2007/12/29 04:52:51 kensmith Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/main.c,v 1.80 2008/05/11 17:23:56 obrien Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -41,6 +41,7 @@ #include <sys/resource.h> const char *StartName; /* Initial contents of argv[0] */ +const char *ProgName = "sysinstall"; static void screech(int sig) ==== //depot/projects/vap/usr.sbin/sysinstall/sysinstall.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/sysinstall/sysinstall.h,v 1.275 2008/01/01 03:59:17 kensmith Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/sysinstall.h,v 1.276 2008/05/11 17:23:56 obrien Exp $ */ #ifndef _SYSINSTALL_H_INCLUDE @@ -479,6 +479,7 @@ extern DMenu MenuFixit; /* Fixit floppy/CDROM/shell menu */ extern int FixItMode; /* FixItMode starts shell on current device (ie Serial port) */ extern const char * StartName; /* Which name we were started as */ +extern const char * ProgName; /* Program's proper name */ extern int NCpus; /* # cpus on machine */ /* Important chunks. */ ==== //depot/projects/vap/usr.sbin/sysinstall/system.c#4 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/system.c,v 1.130 2007/12/09 02:43:28 obrien Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/system.c,v 1.132 2008/05/11 17:23:56 obrien Exp $ * * Jordan Hubbard * @@ -365,10 +365,12 @@ snprintf(buf, FILENAME_MAX, "/stand/help/%s.TXT", file); if (file_readable(buf)) return expand(buf); - snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/sysinstall/help/%s.hlp", file); + snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/%s/help/%s.hlp", ProgName, + file); if (file_readable(buf)) return buf; - snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/sysinstall/help/%s.TXT", file); + snprintf(buf, FILENAME_MAX, "/usr/src/usr.sbin/%s/help/%s.TXT", ProgName, + file); if (file_readable(buf)) return buf; return NULL; ==== //depot/projects/vap/usr.sbin/sysinstall/variable.c#3 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/variable.c,v 1.40 2007/07/04 00:00:41 scf Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/variable.c,v 1.42 2008/05/11 17:23:56 obrien Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -243,12 +243,12 @@ Variable *vp; if (isDebug()) - msgDebug("Writing sysinstall variables to file..\n"); + msgDebug("Writing %s variables to file..\n", ProgName); fp = fopen("/etc/sysinstall.vars", "w"); if (!fp) { - msgConfirm("Unable to write to /etc/sysinstall.vars: %s", - strerror(errno)); + msgConfirm("Unable to write to /etc/%s.vars: %s", + ProgName, strerror(errno)); return DITEM_FAILURE; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805112209.m4BM9BGi024381>