From owner-p4-projects@FreeBSD.ORG  Wed May 30 10:11:40 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 E57E116A46E; Wed, 30 May 2007 10:11:39 +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 8F84916A400
	for <perforce@freebsd.org>; Wed, 30 May 2007 10:11:39 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 7BA0113C45B
	for <perforce@freebsd.org>; Wed, 30 May 2007 10:11:39 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4UABddh011129
	for <perforce@freebsd.org>; Wed, 30 May 2007 10:11:39 GMT
	(envelope-from andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4UABdLD011117
	for perforce@freebsd.org; Wed, 30 May 2007 10:11:39 GMT
	(envelope-from andrew@freebsd.org)
Date: Wed, 30 May 2007 10:11:39 GMT
Message-Id: <200705301011.l4UABdLD011117@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andrew@freebsd.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 120613 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: Wed, 30 May 2007 10:11:40 -0000

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

Change 120613 by andrew@andrew_hermies on 2007/05/30 10:11:03

	Make the back end use getopt to process commandline arguments and read a config file. The config file isn't processed yet.

Affected files ...

.. //depot/projects/soc2007/andrew-update/backend/Makefile#2 edit
.. //depot/projects/soc2007/andrew-update/backend/facund-be.c#3 edit

Differences ...

==== //depot/projects/soc2007/andrew-update/backend/Makefile#2 (text+ko) ====

@@ -1,6 +1,6 @@
 PROG=	facund-be
 
-LDADD+=	-lmd
+LDADD+=	-lutil -lmd
 
 MAN=
 

==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#3 (text+ko) ====

@@ -33,7 +33,9 @@
 #include <sys/time.h>
 
 #include <err.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <libutil.h>
 #include <limits.h>
 #include <sha256.h>
 #include <stdio.h>
@@ -44,7 +46,8 @@
 /* Check if there are updates every 30min  */
 static const time_t default_check_period = 30 * 60;
 
-#define UPDATE_DATA_DIR "/var/db/freebsd-update"
+#define DEFAULT_CONFIG_FILE	"/etc/freebsd-update-control.conf"
+#define UPDATE_DATA_DIR		"/var/db/freebsd-update"
 
 static int has_update(const char *);
 static void* look_for_updates(void *);
@@ -161,7 +164,44 @@
 main(int argc __unused, char *argv[] __unused)
 {
 	const char *base_dirs[] = { "/", NULL };
+	const char *config_file;
+	int config_fd;
+	properties config_data;
+	char ch;
+
+	config_file = DEFAULT_CONFIG_FILE;
+
+	while ((ch = getopt(argc, argv, "c:h")) != -1) {
+		switch(ch) {
+		case 'c':
+			config_file = optarg;
+			break;
+		case 'h':
+		default:
+			fprintf(stderr, "usage: %s [-c config]\n",
+			    getprogname());
+			exit(1);
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	/* Read in the config file */
+	config_fd = open(config_file, O_RDONLY);
+	if (config_fd == -1 && errno != ENOENT) {
+		errx(1, "Could not open the config file");
+	} else if (config_fd != -1) {
+		/* Read in the config file */
+		config_data = properties_read(config_fd);
+
+		if (config_data == NULL) {
+			errx(1, "Could not read the config file");
+		}
+		properties_free(config_data);
+	}
+
 	look_for_updates(base_dirs);
+
 	return 0;
 }