X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=elf%2Fsoname.c;h=8618152402d38c69c4240526d9b96a39f0162771;hp=aa683a53acb3bf726218dc37af3c44e51a396c1a;hb=HEAD;hpb=489ad6b12bcdfd554acd0908a1770187e76e436d

diff --git a/elf/soname.c b/elf/soname.c
index aa683a5..8618152 100644
--- a/elf/soname.c
+++ b/elf/soname.c
@@ -9,7 +9,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <elf.h>
+
+#include "elf.h"
 
 int main(int ac, char **av) {
 	void *elfbase;
@@ -22,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);
 	}
@@ -36,9 +42,14 @@ int main(int ac, char **av) {
 	if (fstat(elffd, &sbuf) == -1) {
 		exit(1);
 	}
+	/* not a regular file? */
 	if (!S_ISREG(sbuf.st_mode)) {
 		exit(1);
 	}
+	/* not at least the size of the elf header? */
+	if ((size_t)sbuf.st_size < sizeof(Elf64_Ehdr)) {
+		exit(1);
+	}
 
 	elfbase = mmap(0, sbuf.st_size, PROT_READ,MAP_PRIVATE, elffd, 0);
 	if (!elfbase) {
@@ -107,9 +118,10 @@ int main(int ac, char **av) {
 	for (dent = (Elf64_Dyn *)((char *)elfbase + dynsect->sh_offset); dent->d_tag != DT_NULL; dent++) {
 		if (dent->d_tag == DT_SONAME) {
 			printf("%s\n", dynname + dent->d_un.d_val);
-			break;
+			/* TODO can there be more than one? */
+			exit(0);
 		}
 	}
 
-	return 0;
+	return 11;
 }