Commit Diff

Commit:
7a427ecd6c5799bc6588a444b4d96a8b86cea9dd
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
rewrite `load' to use the new transaction messages this allows to do stuff like amused show | some shell filtering | amused load without the dangers of races between show and load.
Actions:
Patch | Tree
commit - 19d6b4807a58ea0e289b006d0ae48224ee106526
commit + 7a427ecd6c5799bc6588a444b4d96a8b86cea9dd
blob - 02bbe15906490d60141f220f9f732cfa276ac027
blob + 7b8732b5d739d7950c2738af312d6a7181ea2bab
--- ctl.c
+++ ctl.c
@@ -239,6 +239,69 @@ show_status(struct imsg *imsg, int *ret)
 
 	printf("%s\n", s.path);
 	return 1;
+}
+
+static int
+show_load(struct parse_result *res, struct imsg *imsg, int *ret)
+{
+	const char	*file;
+	char		*line = NULL;
+	char		 path[PATH_MAX];
+	size_t		 linesize = 0;
+	ssize_t		 linelen;
+	int		 any = 0;
+
+	if (imsg->hdr.type == IMSG_CTL_ERR) {
+		print_error_message("load failed", imsg);
+		*ret = 1;
+		return 1;
+	}
+
+	if (imsg->hdr.type == IMSG_CTL_ADD)
+		return 0;
+
+	if (imsg->hdr.type == IMSG_CTL_COMMIT)
+		return 1;
+
+	if (imsg->hdr.type != IMSG_CTL_BEGIN)
+		fatalx("got unexpected message %d", imsg->hdr.type);
+
+	while ((linelen = getline(&line, &linesize, res->file)) != -1) {
+		if (linelen == 0)
+			continue;
+		line[linelen-1] = '\0';
+		file = line;
+		if (file[0] == '>' && file[1] == ' ')
+			file += 2;
+		if (file[0] == ' ' && file[1] == ' ')
+			file += 2;
+
+		memset(&path, 0, sizeof(path));
+		if (realpath(file, path) == NULL) {
+			log_warn("realpath %s", file);
+			continue;
+		}
+
+		any++;
+		imsg_compose(ibuf, IMSG_CTL_ADD, 0, 0, -1,
+		    path, sizeof(path));
+	}
+
+	free(line);
+	if (ferror(res->file))
+		fatal("getline");
+	fclose(res->file);
+	res->file = NULL;
+
+	if (!any) {
+		*ret = 1;
+		return 1;
+	}
+
+	imsg_compose(ibuf, IMSG_CTL_COMMIT, 0, 0, -1,
+	    NULL, 0);
+	imsg_flush(ibuf);
+	return 0;
 }
 
 static int
@@ -288,6 +351,9 @@ ctlaction(struct parse_result *res)
 		imsg_compose(ibuf, IMSG_CTL_PREV, 0, 0, -1, NULL, 0);
 		break;
 	case LOAD:
+		done = 0;
+		imsg_compose(ibuf, IMSG_CTL_BEGIN, 0, 0, -1, NULL, 0);
+		break;
 	case NONE:
 		/* action not expected */
 		fatalx("invalid action %u", res->action);
@@ -321,6 +387,9 @@ ctlaction(struct parse_result *res)
 			case STATUS:
 				done = show_status(&imsg, &ret);
 				break;
+			case LOAD:
+				done = show_load(res, &imsg, &ret);
+				break;
 			default:
 				done = 1;
 				break;
@@ -358,12 +427,6 @@ ctl_add(struct parse_result *res, int argc, char **arg
 int
 ctl_load(struct parse_result *res, int argc, char **argv)
 {
-	const char	*file;
-	char		*line = NULL;
-	char		 path[PATH_MAX];
-	size_t		 linesize = 0;
-	ssize_t		 linelen;
-
 	if (argc < 2)
 		res->file = stdin;
 	else if (argc == 2) {
@@ -375,34 +438,7 @@ ctl_load(struct parse_result *res, int argc, char **ar
 	if (pledge("stdio rpath", NULL) == -1)
 		fatal("pledge");
 
-	imsg_compose(ibuf, IMSG_CTL_FLUSH, 0, 0, -1, NULL, 0);
-
-	while ((linelen = getline(&line, &linesize, res->file)) != -1) {
-		if (linelen == 0)
-			continue;
-		line[linelen-1] = '\0';
-		file = line;
-		if (file[0] == '>' && file[1] == ' ')
-			file += 2;
-		if (file[0] == ' ' && file[1] == ' ')
-			file += 2;
-
-		memset(&path, 0, sizeof(path));
-		if (realpath(file, path) == NULL) {
-			log_warn("realpath %s", file);
-			continue;
-		}
-
-		imsg_compose(ibuf, IMSG_CTL_ADD, 0, 0, -1,
-		    path, sizeof(path));
-	}
-
-	imsg_flush(ibuf);
-	free(line);
-	if (ferror(res->file))
-		fatal("getline");
-	fclose(res->file);
-	return 0;
+	return ctlaction(res);
 }
 
 static int