From: Nathan Wagner <nw@hydaspes.if.org>
Date: Sat, 4 Mar 2017 17:34:19 +0000 (-0600)
Subject: add warnings to compile flags and fix
X-Git-Tag: v0.1.6~146
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=3fbafae81dbc483ba0e37bd66e269702cd666af2

add warnings to compile flags and fix
---

diff --git a/Makefile b/Makefile
index 4685b57..ffb3f5b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CFLAGS=-Wall -std=c99 -Ilib -Ielf -I. -Ilzma/api
+CFLAGS=-Wall -W -Wextra -Werror -std=c99 -Ilib -Ielf -I. -Ilzma/api
 
 LZMAFLAGS=-Ilzma/api -Ilzma/tuklib -Ilzma/lzma -Ilzma/common -Ilzma/check -Ilzma/lz -Ilzma/rangecoder -Ilzma/simple -Ilzma/delta -DHAVE_CHECK_CRC64 -DHAVE_CHECK_CRC32 -DHAVE_ENCODER_LZMA2 -DHAVE_DECODER_LZMA2 -DHAVE_MF_BT4
 
@@ -60,7 +60,7 @@ newdb.c: db.sql
 	echo ", 0};" >> $@
 
 lib/sqlite3.o: lib/sqlite3.c lib/config.h
-	$(CC) $(CFLAGS) -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
+	$(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
 
 $(LZMAOBJ):
 	$(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $*.c
diff --git a/elf/soname.c b/elf/soname.c
index 8b6c451..06e5662 100644
--- a/elf/soname.c
+++ b/elf/soname.c
@@ -23,6 +23,11 @@ int main(int ac, char **av) {
 	char *name, *dynname;
 	Elf64_Dyn *dent;
 
+	if (ac < 2) {
+		fprintf(stderr, "usage: soname <file>\n");
+		exit(EXIT_FAILURE);
+	}
+
 	if (lstat(av[1], &sbuf) == -1) {
 		exit(1);
 	}
@@ -42,7 +47,7 @@ int main(int ac, char **av) {
 		exit(1);
 	}
 	/* not at least the size of the elf header? */
-	if (sbuf.st_size < sizeof(Elf64_Ehdr)) {
+	if ((size_t)sbuf.st_size < sizeof(Elf64_Ehdr)) {
 		exit(1);
 	}
 
diff --git a/lib/db.c b/lib/db.c
index 98608b3..9b19b74 100644
--- a/lib/db.c
+++ b/lib/db.c
@@ -16,6 +16,7 @@
 
 static int callback(void *NotUsed, int argc, char **argv, char **azColName){
 	int i;
+	NotUsed = 0; /* suppress warning */
 	for(i=0; i<argc; i++){
 		printf("%s = %s\n", azColName[i], argv[i] ? argv[i] : "NULL");
 	}
diff --git a/lib/zpm.c b/lib/zpm.c
index 99984fb..d9041ff 100644
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -372,7 +372,7 @@ int zpm_readopts(struct zpm *pkg, int ac, char **av) {
 
 	/* now, parse the options, return optind so the caller can adjust if needed */
 
-	return 1;
+	return av ? ac : 1;
 }
 
 int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
@@ -450,6 +450,7 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
 	//fprintf(stderr, "uncompressing %d bytes at %p, expect %lld\n", blobsize, xzdata, (long long int)size);
 	uncompresslzma(xzdata, blobsize, out);
 	fclose(out);
+	chmod(path, mode);
 
 	sqlite3_finalize(ifile);
 
@@ -498,7 +499,7 @@ int zpm_hash(char *path, char *hash, uint32_t flags) {
 	}
 	hash[64] = 0;
 	munmap(content, sbuf.st_size);
-	return 1;
+	return flags ? fd : 1;
 }
 
 static sqlite3_stmt *run_for_hash(sqlite3 *db, char *sql, char *hash) {
@@ -712,6 +713,7 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
 		hash = hashbuf;
 	}
 
+	flags = 0; /* suppress warning, probably use to follow symlinks */
 	/* mmap the file */
 	fd = open(path, O_RDONLY);
 	if (fd == -1) {