X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-sign.c;h=9df50ec7bf934ff51d290490919876821e801bbc;hb=41e3ea4dbae634ca13941d134e990d953b741c4b;hp=c4faf290fd00bb77bc78a614e8a4415113292426;hpb=f3d64b7c741677cd28e2a11deed67196cd02b46a;p=src%2Fapp-framework-main.git

diff --git a/src/wgtpkg-sign.c b/src/wgtpkg-sign.c
index c4faf29..9df50ec 100644
--- a/src/wgtpkg-sign.c
+++ b/src/wgtpkg-sign.c
@@ -21,7 +21,6 @@
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
-#include <syslog.h>
 #include <getopt.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -48,7 +47,7 @@ static unsigned int get_number(const char *value)
 
 	val = strtoul(value, &end, 10);
 	if (*end || 0 == val || val >= UINT_MAX || *value == '-') {
-		syslog(LOG_ERR, "bad number value %s", value);
+		ERROR("bad number value %s", value);
 		exit(1);
 	}
 	return (unsigned int)val;
@@ -91,7 +90,7 @@ int main(int ac, char **av)
 	char *keyfile, *certfiles[MAXCERT+1], *directory, **x;
 	struct stat s;
 
-	openlog(appname, LOG_PERROR, LOG_USER);
+	LOGUSER(appname);
 
 	force = ncert = author = 0;
 	number = UINT_MAX;
@@ -103,7 +102,7 @@ int main(int ac, char **av)
 		switch (i) {
 		case 'c':
 			if (ncert == MAXCERT) {
-				syslog(LOG_ERR, "maximum count of certificates reached");
+				ERROR("maximum count of certificates reached");
 				return 1;
 			}
 			certfiles[ncert++] = optarg;
@@ -121,14 +120,14 @@ int main(int ac, char **av)
 			verbosity++;
 			break;
 		case ':':
-			syslog(LOG_ERR, "missing argument");
+			ERROR("missing argument");
 			return 1;
 		default:
-			syslog(LOG_ERR, "unrecognized option");
+			ERROR("unrecognized option");
 			return 1;
 		}
 		if (*x != NULL) {
-			syslog(LOG_ERR, "option set twice");
+			ERROR("option set twice");
 			return 1;
 		}
 		*x = optarg;
@@ -136,12 +135,12 @@ int main(int ac, char **av)
 
 	/* remaining arguments and final checks */
 	if (optind >= ac) {
-		syslog(LOG_ERR, "no directory set");
+		ERROR("no directory set");
 		return 1;
 	}
 	directory = av[optind++];
 	if (optind < ac) {
-		syslog(LOG_ERR, "extra parameters found");
+		ERROR("extra parameters found");
 		return 1;
 	}
 
@@ -153,20 +152,20 @@ int main(int ac, char **av)
 
 	/* check values */
 	if (stat(directory, &s)) {
-		syslog(LOG_ERR, "can't find directory %s", directory);
+		ERROR("can't find directory %s", directory);
 		return 1;
 	}
 	if (!S_ISDIR(s.st_mode)) {
-		syslog(LOG_ERR, "%s isn't a directory", directory);
+		ERROR("%s isn't a directory", directory);
 		return 1;
 	}
 	if (access(keyfile, R_OK) != 0) {
-		syslog(LOG_ERR, "can't access private key %s", keyfile);
+		ERROR("can't access private key %s", keyfile);
 		return 1;
 	}
 	for(i = 0 ; i < ncert ; i++) 
 		if (access(certfiles[i], R_OK) != 0) {
-			syslog(LOG_ERR, "can't access certificate %s", certfiles[i]);
+			ERROR("can't access certificate %s", certfiles[i]);
 			return 1;
 		}
 
@@ -176,14 +175,14 @@ int main(int ac, char **av)
 
 
 	/* compute absolutes paths */
-#define rp(x) do { char *p = realpath(x, NULL); if (p != NULL) x = p; else { syslog(LOG_ERR, "realpath failed for %s",x); return 1; } } while(0)
+#define rp(x) do { char *p = realpath(x, NULL); if (p != NULL) x = p; else { ERROR("realpath failed for %s",x); return 1; } } while(0)
 	rp(keyfile);
 	for(i = 0 ; i < ncert ; i++) 
 		rp(certfiles[i]);
 #undef rp
 
 	/* set and enter the workdir */
-	if (set_workdir(directory, 0) || enter_workdir(0))
+	if (set_workdir(directory, 0))
 		return 1;
 
 	if (fill_files())
@@ -195,11 +194,11 @@ int main(int ac, char **av)
 		for (number = 1; get_signature(number) != NULL ; number++);
 
 	if (!force && get_signature(number) != NULL) {
-		syslog(LOG_ERR, "can't overwrite existing signature %s", get_signature(number)->name);
+		ERROR("can't overwrite existing signature %s", get_signature(number)->name);
 		return 1;
 	}
 
-	notice("-- SIGNING content of directory %s for number %u", directory, number);
+	NOTICE("-- SIGNING content of directory %s for number %u", directory, number);
 
 	certfiles[ncert] = NULL;
 	return !!create_digsig(number, keyfile, (const char**)certfiles);