mbop: switch iteration from argv to argc

Stop relying on a trailing NULL sentinel in string arrays.
(Needed for HX_getopt6 soon.)

Author: jengelh

tools/mbop_delmsg.cpp

@@ -51,10 +51,10 @@ int main(int argc, char **argv)
 	if (rop_util_get_gc_value(g_folderid) == 0)
 		return help();
 	std::vector<uint64_t> eids;
-	while (*++argv != nullptr) {
-		eid_t eid = gi_lookup_eid_by_name(g_storedir, *argv);
+	for (int uidx = 1; uidx < argc; ++uidx) {
+		eid_t eid = gi_lookup_eid_by_name(g_storedir, argv[uidx]);
 		if (eid == 0) {
-			mbop_fprintf(stderr, "Not recognized/found: \"%s\"\n", *argv);
+			mbop_fprintf(stderr, "Not recognized/found: \"%s\"\n", argv[uidx]);
 			return EXIT_FAILURE;
 		}
 		eids.push_back(eid);

tools/mbop_emptyfld.cpp

@@ -201,11 +201,11 @@ int main(int argc, char **argv)
 	}
 
 	int ret = EXIT_SUCCESS;
-	while (*++argv != nullptr) {
+	for (int uidx = 1; uidx < argc; ++uidx) {
 		BOOL partial = false;
-		eid_t eid = gi_lookup_eid_by_name(g_storedir, *argv);
+		eid_t eid = gi_lookup_eid_by_name(g_storedir, argv[uidx]);
 		if (eid == 0) {
-			mbop_fprintf(stderr, "Not recognized/found: \"%s\"\n", *argv);
+			mbop_fprintf(stderr, "Not recognized/found: \"%s\"\n", argv[uidx]);
 			return EXIT_FAILURE;
 		}
 		if (g_cutoff_time != 0 || g_recurse) {
@@ -220,14 +220,14 @@ int main(int argc, char **argv)
 		auto ok = exmdb_client->empty_folder(g_storedir, CP_UTF8, nullptr,
 		          eid, g_del_flags, &partial);
 		if (!ok) {
-			mbop_fprintf(stderr, "empty_folder(%s) failed\n", *argv);
+			mbop_fprintf(stderr, "empty_folder(%s) failed\n", argv[uidx]);
 			ret = EXIT_FAILURE;
 		}
 		delcount(eid, &curr_delc, &curr_fldc);
 		if (partial)
 			printf("Partial completion (e.g. essential permanent folders were not deleted)\n");
 		printf("Folder %s: deleted %d message(s), deleted %d subfolder(s) plus messages\n",
-			*argv, curr_delc - prev_delc, prev_fldc - curr_fldc);
+			argv[uidx], curr_delc - prev_delc, prev_fldc - curr_fldc);
 		if (ret != EXIT_SUCCESS)
 			break;
 	}

tools/mbop_purge.cpp

@@ -35,10 +35,10 @@ int main(int argc, char **argv)
 	if (argc < 2)
 		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);
+	for (int uidx = 1; uidx < argc; ++uidx) {
+		eid_t eid = gi_lookup_eid_by_name(g_storedir, argv[uidx]);
 		if (eid == 0) {
-			mbop_fprintf(stderr, "Not recognized/found: \"%s\"\n", *argv);
+			mbop_fprintf(stderr, "Not recognized/found: \"%s\"\n", argv[uidx]);
 			return EXIT_FAILURE;
 		}
 		unsigned int flags = g_recursive ? DEL_FOLDERS : 0;
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
 		          eid, flags, age, &st_folders, &st_messages,
 		          &sz_normal, &sz_fai);
 		if (!ok) {
-			mbop_fprintf(stderr, "purge_softdel %s failed\n", *argv);
+			mbop_fprintf(stderr, "purge_softdel %s failed\n", argv[uidx]);
 			return EXIT_FAILURE;
 		}
 		char nbuf[32], fbuf[32];