summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2006-02-28 20:34:50 +0000
committerjhb <jhb@FreeBSD.org>2006-02-28 20:34:50 +0000
commitd96acf1070bb4a086dfa9c9b3426ba29ea30bd52 (patch)
tree0f604f443e56ea9b0019999dc7eabec9591d602f
parent0aeeea8f00e36e75986095f9a9129081094ab8b2 (diff)
downloadFreeBSD-src-d96acf1070bb4a086dfa9c9b3426ba29ea30bd52.zip
FreeBSD-src-d96acf1070bb4a086dfa9c9b3426ba29ea30bd52.tar.gz
G/C some cruft.
-rw-r--r--usr.sbin/sade/config.c37
-rw-r--r--usr.sbin/sade/system.c2
-rw-r--r--usr.sbin/sysinstall/config.c37
-rw-r--r--usr.sbin/sysinstall/system.c2
4 files changed, 4 insertions, 74 deletions
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index dae6d06..632c242 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -616,43 +616,6 @@ configSecurity(dialogMenuItem *self)
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)
{
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index b6fdbfb..406877d 100644
--- a/usr.sbin/sade/system.c
+++ b/usr.sbin/sade/system.c
@@ -95,6 +95,7 @@ handle_intr(int sig)
restorescr(save);
}
+#if 0
/*
* Harvest children if we are init.
*/
@@ -107,6 +108,7 @@ reap_children(int sig)
;
errno = errbak;
}
+#endif
/* Expand a file into a convenient location, nuking it each time */
static char *
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index dae6d06..632c242 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -616,43 +616,6 @@ configSecurity(dialogMenuItem *self)
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)
{
diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c
index b6fdbfb..406877d 100644
--- a/usr.sbin/sysinstall/system.c
+++ b/usr.sbin/sysinstall/system.c
@@ -95,6 +95,7 @@ handle_intr(int sig)
restorescr(save);
}
+#if 0
/*
* Harvest children if we are init.
*/
@@ -107,6 +108,7 @@ reap_children(int sig)
;
errno = errbak;
}
+#endif
/* Expand a file into a convenient location, nuking it each time */
static char *
OpenPOWER on IntegriCloud