shithub: riscv

Download patch

ref: 5c78e0bd5789829aace4ccc798d672d7bc8b459f
parent: e2124b109ecb0f5634f036e392d827b6ddebec54
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Thu Aug 25 17:46:24 EDT 2022

audio/mkplist: don't fail entirely if a directory is not accessible

--- a/sys/src/cmd/audio/zuke/mkplist.c
+++ b/sys/src/cmd/audio/zuke/mkplist.c
@@ -47,8 +47,10 @@
 	else if((numall & (numall-1)) == 0)
 		all = realloc(all, numall*2*sizeof(Meta));
 
-	if(all == nil)
+	if(all == nil){
+		sysfatal("newmeta: no memory");
 		return nil;
+	}
 
 	memset(&all[numall++], 0, sizeof(Meta));
 	return &all[numall-1];
@@ -184,8 +186,7 @@
 		fprint(2, "%s: %r\n", path);
 		return;
 	}
-	if((curr = newmeta()) == nil)
-		sysfatal("no memory");
+	curr = newmeta();
 	firstiscomposer = keepfirstartist = 0;
 	res = tagsget(&ctx);
 	if(ctx.format != Funknown){
@@ -227,11 +228,13 @@
 	long n;
 	int dirfd, len;
 
-	if((dirfd = open(*dir, OREAD)) < 0)
-		sysfatal("%s: %r", *dir);
+	if((dirfd = open(*dir, OREAD)) < 0){
+		fprint(2, "scan: %r\n");
+		return -1;
+	}
 	len = strlen(*dir);
 	if((*dir = realloc(*dir, len+1+Maxname)) == nil)
-		sysfatal("no memory");
+		sysfatal("scan: no memory");
 	path = *dir;
 	path[len] = '/';
 
@@ -346,8 +349,7 @@
 
 	for(i = 0; i < argc; i++){
 		if(strncmp(argv[i], "http://", 7) == 0 || strncmp(argv[i], "https://", 8) == 0){
-			if((curr = newmeta()) == nil)
-				sysfatal("no memory");
+			curr = newmeta();
 			curr->title = argv[i];
 			curr->path = argv[i];
 			curr->filefmt = "";