mbop: model g_command_num behavior the way it was meant

In a command like

	mbop -cvu [email protected] \( emptyfld DRAFT \) \( emptyfld -a DRAFT \)

there can be many log messages that could indicate failure.
(Pathalogic case: exmdb not running.) Prefix them with an indicator
to which command they belong.

exmdb_client: HX_inet_connect to [::1]:5000: Connection refused
/var/lib/gromox/user/horio [cmd 1]: delcount: get_folder_properties failed
/var/lib/gromox/user/horio [cmd 1]: empty_folder(DRAFT) failed
/var/lib/gromox/user/horio [cmd 1]: delcount: get_folder_properties failed
Folder DRAFT: deleted 0 messages, deleted 0 subfolders plus messages
/var/lib/gromox/user/horio [cmd 2]: delcount: get_folder_properties failed
/var/lib/gromox/user/horio [cmd 2]: empty_folder(DRAFT) failed
/var/lib/gromox/user/horio [cmd 2]: delcount: get_folder_properties failed

References: GXH-145, GXL-427

Author: jengelh

tools/mbop_foreach.cpp

@@ -110,7 +110,6 @@ int main(int argc, char **argv)
 	    HXOPT_RQ_ORDER | HXOPT_USAGEONERR) != HXOPT_ERR_SUCCESS ||
 	    g_exit_after_optparse)
 		return EXIT_PARAM;
-	global::g_command_num = 0;
 	auto cl_0 = HX::make_scope_exit([=]() { HX_zvecfree(argv); });
 	if (global::g_arg_username != nullptr || global::g_arg_userdir != nullptr) {
 		fprintf(stderr, "Cannot use -d/-u with foreach.*\n");
@@ -121,6 +120,7 @@ int main(int argc, char **argv)
 	auto fe_mode = argv[0];
 	--argc;
 	++argv;
+	++global::g_command_num;
 	if (argc == 0)
 		return help();
 
@@ -182,13 +182,14 @@ int main(int argc, char **argv)
 			}, &user.maildir, &sem, &ret));
 		}
 	} else {
+		auto saved_cnum = global::g_command_num;
 		for (auto &&user : ul) {
 			/* cmd_parser is not thread-safe (global state), cannot parallelize */
 			g_dstuser = std::move(user.username);
 			g_storedir_s = std::move(user.maildir);
 			g_storedir = g_storedir_s.c_str();
+			global::g_command_num = saved_cnum;
 			ret = global::cmd_parser(argc, argv);
-			++global::g_command_num;
 			if (ret == EXIT_PARAM)
 				return ret;
 			else if (ret != EXIT_SUCCESS && !global::g_continuous_mode)

tools/mbop_locale.cpp

@@ -62,7 +62,7 @@ int main(int argc, char **argv)
 				return EXIT_FAILURE;
 			}
 			auto orig_name = props.get<const char>(PR_DISPLAY_NAME);
-			printf("[0x%02x] %s -> %s\n", gcv, znul(orig_name), new_name);
+			mbop_fprintf(stdout, "[0x%02x] %s -> %s\n", gcv, znul(orig_name), new_name);
 		}
 		TAGGED_PROPVAL tp = {PR_DISPLAY_NAME, deconst(new_name)};
 		const TPROPVAL_ARRAY new_props = {1, &tp};

tools/mbop_main.cpp

@@ -54,7 +54,7 @@ void delcount(eid_t fid, uint32_t *delc, uint32_t *fldc)
 	*delc = *fldc = 0;
 	if (!exmdb_client->get_folder_properties(g_storedir, CP_ACP, fid,
 	    &taghdr, &props)) {
-		fprintf(stderr, "delcount: get_folder_properties failed\n");
+		mbop_fprintf(stderr, "delcount: get_folder_properties failed\n");
 		return;
 	}
 	auto c = props.get<const uint32_t>(tags[0]);
@@ -205,7 +205,7 @@ static int freeze_main(int argc, char **argv)
 	                          db_maint_mode::reject_waitforexcl;
 	auto ok = exmdb_client->set_maintenance(g_storedir, static_cast<uint32_t>(mode));
 	if (!ok) {
-		fprintf(stderr, "%s: the operation failed\n", argv[0]);
+		mbop_fprintf(stderr, "%s: the operation failed\n", argv[0]);
 		return EXIT_FAILURE;
 	}
 	return EXIT_SUCCESS;
@@ -265,11 +265,11 @@ static errno_t showstoreprop(proptag_t proptag)
 		auto bv = vals.get<const BINARY>(proptag);
 		if (bv == nullptr) {
 			if (isatty(STDERR_FILENO))
-				fprintf(stderr, "Property is unset\n");
+				mbop_fprintf(stderr, "Property is unset\n");
 			return 0;
 		}
 		if (isatty(STDOUT_FILENO) && isatty(STDERR_FILENO))
-			fprintf(stderr, "[%u bytes of binary data]\n", bv->cb);
+			mbop_fprintf(stderr, "[%u bytes of binary data]\n", bv->cb);
 		if (!isatty(STDOUT_FILENO)) {
 			auto ret = HXio_fullwrite(STDOUT_FILENO, bv->pc, bv->cb);
 			if (ret < 0 || static_cast<size_t>(ret) != bv->cb)
@@ -353,10 +353,10 @@ static int setstoreprop(int argc, char **argv, const GUID guid,
 	propid_t propid = 0;
 	auto err = resolvename(guid, name, true, &propid);
 	if (err == ENOENT) {
-		fprintf(stderr, "namedprop %s not found\n", name);
+		mbop_fprintf(stderr, "namedprop %s not found\n", name);
 		return EXIT_FAILURE;
 	} else if (err != 0) {
-		fprintf(stderr, "%s\n", strerror(-err));
+		mbop_fprintf(stderr, "%s\n", strerror(-err));
 		return EXIT_FAILURE;
 	}
 	return setstoreprop(PROP_TAG(proptype, propid));
@@ -503,7 +503,8 @@ int cmd_parser(int argc, char **argv)
 		return EXIT_FAILURE;
 	if (strcmp(argv[0], "(") == 0)
 		return parens_parser(argc, argv);
-	else if (strcmp(argv[0], "delmsg") == 0)
+	++g_command_num;
+	if (strcmp(argv[0], "delmsg") == 0)
 		return delmsg::main(argc, argv);
 	else if (strcmp(argv[0], "emptyfld") == 0)
 		return emptyfld::main(argc, argv);

tools/mbop_purge.cpp

@@ -33,19 +33,19 @@ int main(int argc, char **argv)
 		return EXIT_PARAM;
 	auto cl_0 = HX::make_scope_exit([=]() { HX_zvecfree(argv); });
 	if (argc < 2)
-		fprintf(stderr, "mbop/purge: No folders specified, no action taken.\n");
+		mbop_fprintf(stderr, "mbop/purge: No folders specified, no action taken.\n");
 	auto age = rop_util_unix_to_nttime(time(nullptr) - HX_strtoull_sec(znul(g_age_str), nullptr));
 	while (*++argv != nullptr) {
 		eid_t eid = gi_lookup_eid_by_name(g_storedir, *argv);
 		if (eid == 0) {
-			fprintf(stderr, "Not recognized/found: \"%s\"\n", *argv);
+			mbop_fprintf(stderr, "Not recognized/found: \"%s\"\n", *argv);
 			return EXIT_FAILURE;
 		}
 		unsigned int flags = g_recursive ? DEL_FOLDERS : 0;
 		auto ok = exmdb_client->purge_softdelete(g_storedir, nullptr,
 		          eid, flags, age);
 		if (!ok) {
-			fprintf(stderr, "purge_softdel %s failed\n", *argv);
+			mbop_fprintf(stderr, "purge_softdel %s failed\n", *argv);
 			return EXIT_FAILURE;
 		}
 	}
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 	if (g_zero_lastcn)
 		flags |= CGKRESET_ZERO_LASTCN;
 	if (!exmdb_client->cgkreset(g_storedir, flags)) {
-		fprintf(stderr, "cgkreset %s failed\n", g_storedir);
+		mbop_fprintf(stderr, "cgkreset %s failed\n", g_storedir);
 		return EXIT_FAILURE;
 	}
 	return EXIT_SUCCESS;