[Glibc-bsd-commits] r2869 - trunk/freebsd-utils/debian/patches
Aurelien Jarno
aurel32 at alioth.debian.org
Sat Nov 28 22:18:50 UTC 2009
Author: aurel32
Date: 2009-11-28 22:18:50 +0000 (Sat, 28 Nov 2009)
New Revision: 2869
Removed:
trunk/freebsd-utils/debian/patches/019_kenv_sources.diff
Modified:
trunk/freebsd-utils/debian/patches/series
Log:
Drop 019_kenv_sources.diff
Deleted: trunk/freebsd-utils/debian/patches/019_kenv_sources.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/019_kenv_sources.diff 2009-11-28 22:15:10 UTC (rev 2868)
+++ trunk/freebsd-utils/debian/patches/019_kenv_sources.diff 2009-11-28 22:18:50 UTC (rev 2869)
@@ -1,286 +0,0 @@
-This patch is there to avoid regenerating a new .orig.tar.gz. It can be
-dropped when a new one is generated.
-
---- a/bin/kenv/Makefile
-+++ b/bin/kenv/Makefile
-@@ -0,0 +1,5 @@
-+# $FreeBSD$
-+
-+PROG= kenv
-+
-+.include <bsd.prog.mk>
---- a/bin/kenv/kenv.1
-+++ b/bin/kenv/kenv.1
-@@ -0,0 +1,77 @@
-+.\"-
-+.\" Copyright (c) 2000 Peter Wemm <peter at FreeBSD.org>
-+.\"
-+.\" Redistribution and use in source and binary forms, with or without
-+.\" 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.
-+.\" 2. Redistributions in binary form must reproduce the above copyright
-+.\" notice, this list of conditions and the following disclaimer in the
-+.\" documentation and/or other materials provided with the distribution.
-+.\"
-+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
-+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
-+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+.\" SUCH DAMAGE.
-+.\"
-+.\" $FreeBSD$
-+.\"
-+.Dd September 13, 2005
-+.Dt KENV 1
-+.Os
-+.Sh NAME
-+.Nm kenv
-+.Nd dump or modify the kernel environment
-+.Sh SYNOPSIS
-+.Nm
-+.Op Fl hq
-+.Nm
-+.Op Fl q
-+.Ar variable Ns Op = Ns Ar value
-+.Nm
-+.Op Fl q
-+.Fl u
-+.Ar variable
-+.Sh DESCRIPTION
-+The
-+.Nm
-+utility will dump the kernel environment if
-+invoked without arguments.
-+If the
-+.Fl h
-+option is specified, it will limit the report to kernel probe hints.
-+If an optional
-+.Ar variable
-+name is specified,
-+.Nm
-+will only report that value.
-+If the
-+.Fl u
-+option is specified,
-+.Nm
-+will delete the given environment variable.
-+If the environment variable is followed by an optional
-+.Ar value ,
-+.Nm
-+will set the environment variable to this value.
-+.Pp
-+If the
-+.Fl q
-+option is set, warnings normally printed as a result of being unable to
-+perform the requested operation will be suppressed.
-+.Sh SEE ALSO
-+.Xr kenv 2 ,
-+.Xr loader 8
-+.Sh HISTORY
-+The
-+.Nm
-+utility appeared in
-+.Fx 4.1.1 .
---- a/bin/kenv/kenv.c
-+++ b/bin/kenv/kenv.c
-@@ -0,0 +1,192 @@
-+/*-
-+ * Copyright (c) 2000 Peter Wemm <peter at freebsd.org>
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * 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.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#include <sys/cdefs.h>
-+__FBSDID("$FreeBSD$");
-+
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <err.h>
-+#include <kenv.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+static void usage(void);
-+static int kdumpenv(void);
-+static int kgetenv(char *);
-+static int ksetenv(char *, char *);
-+static int kunsetenv(char *);
-+
-+static int hflag = 0;
-+static int qflag = 0;
-+static int uflag = 0;
-+
-+static void
-+usage(void)
-+{
-+ (void)fprintf(stderr, "%s\n%s\n%s\n",
-+ "usage: kenv [-hq]",
-+ " kenv [-q] variable[=value]",
-+ " kenv [-q] -u variable");
-+ exit(1);
-+}
-+
-+int
-+main(int argc, char **argv)
-+{
-+ char *env, *eq, *val;
-+ int ch, error;
-+
-+ error = 0;
-+ val = NULL;
-+ env = NULL;
-+ while ((ch = getopt(argc, argv, "hqu")) != -1) {
-+ switch (ch) {
-+ case 'h':
-+ hflag++;
-+ break;
-+ case 'q':
-+ qflag++;
-+ break;
-+ case 'u':
-+ uflag++;
-+ break;
-+ default:
-+ usage();
-+ }
-+ }
-+ argc -= optind;
-+ argv += optind;
-+ if (argc > 0) {
-+ env = argv[0];
-+ eq = strchr(env, '=');
-+ if (eq != NULL) {
-+ *eq++ = '\0';
-+ val = eq;
-+ }
-+ argv++;
-+ argc--;
-+ }
-+ if (hflag && (env != NULL))
-+ usage();
-+ if ((argc > 0) || (uflag && (env == NULL)))
-+ usage();
-+ if (env == NULL) {
-+ error = kdumpenv();
-+ if (error && !qflag)
-+ warn("kdumpenv");
-+ } else if (val == NULL) {
-+ if (uflag) {
-+ error = kunsetenv(env);
-+ if (error && !qflag)
-+ warnx("unable to unset %s", env);
-+ } else {
-+ error = kgetenv(env);
-+ if (error && !qflag)
-+ warnx("unable to get %s", env);
-+ }
-+ } else {
-+ error = ksetenv(env, val);
-+ if (error && !qflag)
-+ warnx("unable to set %s to %s", env, val);
-+ }
-+ return (error);
-+}
-+
-+static int
-+kdumpenv()
-+{
-+ char *buf, *cp;
-+ int buflen, envlen;
-+
-+ envlen = kenv(KENV_DUMP, NULL, NULL, 0);
-+ if (envlen < 0)
-+ return (-1);
-+ for (;;) {
-+ buflen = envlen * 120 / 100;
-+ buf = malloc(buflen + 1);
-+ if (buf == NULL)
-+ return (-1);
-+ memset(buf, 0, buflen + 1); /* Be defensive */
-+ envlen = kenv(KENV_DUMP, NULL, buf, buflen);
-+ if (envlen < 0) {
-+ free(buf);
-+ return (-1);
-+ }
-+ if (envlen > buflen)
-+ free(buf);
-+ else
-+ break;
-+ }
-+
-+ for (; *buf != '\0'; buf += strlen(buf) + 1) {
-+ if (hflag) {
-+ if (strncmp(buf, "hint.", 5) != 0)
-+ continue;
-+ }
-+ cp = strchr(buf, '=');
-+ if (cp == NULL)
-+ continue;
-+ *cp++ = '\0';
-+ printf("%s=\"%s\"\n", buf, cp);
-+ buf = cp;
-+ }
-+ return (0);
-+}
-+
-+static int
-+kgetenv(char *env)
-+{
-+ char buf[1024];
-+ int ret;
-+
-+ ret = kenv(KENV_GET, env, buf, sizeof(buf));
-+ if (ret == -1)
-+ return (ret);
-+ printf("%s\n", buf);
-+ return (0);
-+}
-+
-+static int
-+ksetenv(char *env, char *val)
-+{
-+ int ret;
-+
-+ ret = kenv(KENV_SET, env, val, strlen(val)+1);
-+ if (ret == 0)
-+ printf("%s=\"%s\"\n", env, val);
-+ return (ret);
-+}
-+
-+static int
-+kunsetenv(char *env)
-+{
-+ int ret;
-+
-+ ret = kenv(KENV_UNSET, env, NULL, 0);
-+ return (ret);
-+}
Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series 2009-11-28 22:15:10 UTC (rev 2868)
+++ trunk/freebsd-utils/debian/patches/series 2009-11-28 22:18:50 UTC (rev 2869)
@@ -16,6 +16,5 @@
016_swapon.diff
017_sysctl.diff
018_umount.diff
-#019_kenv_sources.diff
020_lib.diff
021_netstat.diff
More information about the Glibc-bsd-commits
mailing list