[Midnightbsd-cvs] src: usr.sbin/sysinstall: Bring to warns2

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri May 2 03:18:58 EDT 2008


Log Message:
-----------
Bring to warns2

Modified Files:
--------------
    src/usr.sbin/sysinstall:
        Makefile (r1.2 -> r1.3)
        config.c (r1.10 -> r1.11)
        dist.h (r1.3 -> r1.4)
        media.c (r1.5 -> r1.6)
        menus.c (r1.10 -> r1.11)
        misc.c (r1.4 -> r1.5)
        system.c (r1.3 -> r1.4)

-------------- next part --------------
Index: config.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/config.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -L usr.sbin/sysinstall/config.c -L usr.sbin/sysinstall/config.c -u -r1.10 -r1.11
--- usr.sbin/sysinstall/config.c
+++ usr.sbin/sysinstall/config.c
@@ -596,43 +596,6 @@
     return DITEM_SUCCESS;
 }
 
-static void
-write_root_xprofile(char *str)
-{
-    FILE *fp;
-    int len;
-    char **cp;
-    static char *flist[] = { /* take care of both xdm and startx */
-	"/root/.xinitrc",
-	"/root/.xsession",
-	"/usr/share/skel/dot.xinitrc",
-	"/usr/share/skel/dot.xsession",
-	NULL,
-    };
-
-    len = strlen(str);
-    for (cp = flist; *cp; cp++) {
-	fp = fopen(*cp, "w");
-	if (fp) {
-	    fwrite(str, 1, len, fp);
-	    fchmod(fileno(fp), 0755);
-	    fclose(fp);
-	}
-    }
-}
-
-static int
-gotit(char *fname)
-{
-    char tmp[FILENAME_MAX];
-
-    snprintf(tmp, sizeof tmp, "/usr/X11R6/bin/%s", fname);
-    if (file_executable(tmp))
-	return TRUE;
-    snprintf(tmp, sizeof tmp, "/usr/local/bin/%s", fname);
-    return file_executable(tmp);
-}
-
 int
 configResolv(dialogMenuItem *ditem)
 {
Index: media.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/media.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -L usr.sbin/sysinstall/media.c -L usr.sbin/sysinstall/media.c -u -r1.5 -r1.6
--- usr.sbin/sysinstall/media.c
+++ usr.sbin/sysinstall/media.c
@@ -899,6 +899,6 @@
 
     mediasize = strtol(size, (char **)NULL, 10);
     mediasize *= 512; /* Convert this to --blocksize */
-    asprintf(&ret, "%d", mediasize);
+    asprintf(&ret, "%ld", mediasize);
     return ret;
 }
Index: dist.h
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/dist.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -L usr.sbin/sysinstall/dist.h -L usr.sbin/sysinstall/dist.h -u -r1.3 -r1.4
--- usr.sbin/sysinstall/dist.h
+++ usr.sbin/sysinstall/dist.h
@@ -1,5 +1,4 @@
-/* $FreeBSD: src/usr.sbin/sysinstall/dist.h,v 1.65 2005/06/16 18:16:13 ru Exp $ 
- * $MidnightBSD$
+/* $MidnightBSD$ */
 /* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/usr.sbin/sysinstall/dist.h,v 1.67.2.4.2.1 2008/01/14 19:28:43 kensmith Exp $  */
 
 #ifndef _DIST_H_INCLUDE
Index: system.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/system.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -L usr.sbin/sysinstall/system.c -L usr.sbin/sysinstall/system.c -u -r1.3 -r1.4
--- usr.sbin/sysinstall/system.c
+++ usr.sbin/sysinstall/system.c
@@ -96,19 +96,6 @@
     restorescr(save);
 }
 
-/*
- * Harvest children if we are init.
- */
-static void
-reap_children(int sig)
-{
-    int errbak = errno;
-
-    while (waitpid(-1, NULL, WNOHANG) > 0)
-	;
-    errno = errbak;
-}
-
 /* Expand a file into a convenient location, nuking it each time */
 static char *
 expand(char *fname)
@@ -188,9 +175,6 @@
 	setenv("PATH", "/stand:/bin:/sbin:/usr/sbin:/usr/bin:/mnt/bin:/mnt/sbin:/mnt/usr/sbin:/mnt/usr/bin:/usr/X11R6/bin", 1);
 	setbuf(stdin, 0);
 	setbuf(stderr, 0);
-#if 0
-	signal(SIGCHLD, reap_children);
-#endif
 	memset(&ufs_args, 0, sizeof(ufs_args));
 	mount("ufs", "/", MNT_UPDATE, &ufs_args);
     }
Index: menus.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/menus.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -L usr.sbin/sysinstall/menus.c -L usr.sbin/sysinstall/menus.c -u -r1.10 -r1.11
--- usr.sbin/sysinstall/menus.c
+++ usr.sbin/sysinstall/menus.c
@@ -122,17 +122,6 @@
 }
 
 static int
-x11FlagCheck(dialogMenuItem *item)
-{
-    if (XOrgDists != 0)
-	Dists |= DIST_XORG;
-    else
-	Dists &= ~DIST_XORG;
-
-    return Dists & DIST_XORG;
-}
-
-static int
 checkTrue(dialogMenuItem *item)
 {
     return TRUE;
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L usr.sbin/sysinstall/Makefile -L usr.sbin/sysinstall/Makefile -u -r1.2 -r1.3
--- usr.sbin/sysinstall/Makefile
+++ usr.sbin/sysinstall/Makefile
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.134.2.1 2005/10/07 15:56:30 nyan Exp $
 
 .if ${MACHINE_ARCH} != "ia64"
@@ -14,6 +15,8 @@
 	system.c tape.c tcpip.c termcap.c ttys.c ufs.c usb.c user.c \
 	variable.c ${_wizard} keymap.h
 
+WARNS?=	2
+
 CFLAGS+= -DUSE_GZIP=1
 CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I.
 
Index: misc.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/misc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -L usr.sbin/sysinstall/misc.c -L usr.sbin/sysinstall/misc.c -u -r1.4 -r1.5
--- usr.sbin/sysinstall/misc.c
+++ usr.sbin/sysinstall/misc.c
@@ -39,6 +39,7 @@
 #include <sys/errno.h>
 #include <sys/file.h>
 #include <sys/types.h>
+#include <sys/sysctl.h>
 #include <dirent.h>
 #include <sys/wait.h>
 #include <sys/param.h>


More information about the Midnightbsd-cvs mailing list