From owner-p4-projects@FreeBSD.ORG  Thu Jan 18 19:03:35 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CC51B16A4CA; Thu, 18 Jan 2007 19:03:35 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A3D6016A4A0
	for <perforce@freebsd.org>; Thu, 18 Jan 2007 19:03:35 +0000 (UTC)
	(envelope-from jkim@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 7A67913C4BD
	for <perforce@freebsd.org>; Thu, 18 Jan 2007 19:03:35 +0000 (UTC)
	(envelope-from jkim@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0IJ3ZSR094387
	for <perforce@freebsd.org>; Thu, 18 Jan 2007 19:03:35 GMT
	(envelope-from jkim@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0IJ3ZSu094383
	for perforce@freebsd.org; Thu, 18 Jan 2007 19:03:35 GMT
	(envelope-from jkim@freebsd.org)
Date: Thu, 18 Jan 2007 19:03:35 GMT
Message-Id: <200701181903.l0IJ3ZSu094383@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jkim@freebsd.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 113130 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Jan 2007 19:03:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=113130

Change 113130 by jkim@jkim_hammer on 2007/01/18 19:02:51

	- Use global 'version' instead of sysctl mib to construct build date.
	- Construct builder string from 'version' instead of fake one.

Affected files ...

.. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#9 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#9 (text+ko) ====

@@ -422,28 +422,44 @@
 linprocfs_osbuild(struct thread *td, struct sbuf *sb)
 {
 	char osbuild[256];
-	int kern_ver[2];
-	size_t size;
 	char *cp1, *cp2;
 
-	cp1 = NULL;
-	kern_ver[0] = CTL_KERN;
-	kern_ver[1] = KERN_VERSION;
-	osbuild[0] = '\0';
-	size = sizeof(osbuild);
-	if (kernel_sysctl(td, kern_ver, 2, &osbuild, &size, 0, 0, 0, 0) == 0) {
-		cp1 = strstr(osbuild, "\n");
-		cp2 = strstr(osbuild, ":");
-		if (cp1 && cp2) {
-			*cp1 = *cp2 = '\0';
-			cp1 = strstr(osbuild, "#");
-		} else
-			cp1 = NULL;
-	}
+	strncpy(osbuild, version, 256);
+	osbuild[255] = '\0';
+	cp1 = strstr(osbuild, "\n");
+	cp2 = strstr(osbuild, ":");
+	if (cp1 && cp2) {
+		*cp1 = *cp2 = '\0';
+		cp1 = strstr(osbuild, "#");
+	} else
+		cp1 = NULL;
 	if (cp1)
 		sbuf_printf(sb, "%s%s", cp1, cp2 + 1);
 	else
-		sbuf_printf(sb, "#4 Sun Dec 18 04:30:00 CET 1977");
+		sbuf_cat(sb, "#4 Sun Dec 18 04:30:00 CET 1977");
+}
+
+/*
+ * Get OS builder
+ */
+static void
+linprocfs_osbuilder(struct thread *td, struct sbuf *sb)
+{
+	char builder[256];
+	char *cp;
+
+	cp = strstr(version, "\n    ");
+	if (cp) {
+		strncpy(builder, cp + 5, 256);
+		builder[255] = '\0';
+		cp = strstr(builder, ":");
+		if (cp)
+			*cp = '\0';
+	}
+	if (cp)
+		sbuf_cat(sb, builder);
+	else
+		sbuf_cat(sb, "des@freebsd.org");
 }
 
 /*
@@ -457,8 +473,9 @@
 
 	linux_get_osname(td, osname);
 	linux_get_osrelease(td, osrelease);
-	sbuf_printf(sb, "%s version %s (des@freebsd.org) (gcc version "
-	    __VERSION__ ") ", osname, osrelease);
+	sbuf_printf(sb, "%s version %s (", osname, osrelease);
+	linprocfs_osbuilder(td, sb);
+	sbuf_cat(sb, ") (gcc version " __VERSION__ ") ");
 	linprocfs_osbuild(td, sb);
 	sbuf_cat(sb, "\n");