mt2exm: support folder lookup by EID

The mbop utility supported folder specification by number, mt2exm did
not. But then, the mt2exm manpage was edited to simply refer to the
mbop manpage, causing documented behavior to no longer match with
actual program behavior.

Move the number parse logic into lookup_eid_by_name and call it a
day.

References: DESK-3426

Author: jengelh

doc/gromox-mbop.8

@@ -371,22 +371,33 @@ Issue the SQLite ".vacuum" command on the user's exchange.sqlite3 file in an
 attempt to reclaim unused disk space and shrink it. This operation can
 potentially run for quite some time, during which the mailbox is inaccessible.
 .SH Folder specification
-\fIfolder_spec\fP can either be a numeric identifier, or a path-like
-specification into the folder hierarchy. If the name starts with the slash
-character '/', it is interpreted as starting from the root; otherwise, the
-first component must be a special fixed name (untranslated) (CALENDAR,
-COMMON_VIEWS, CONFLICTS, CONTACTS, DEFERRED_ACTION, DELETED (TRASH,
-WASTEBASKET), DRAFT, FINDER, INBOX, IPM_SUBTREE, JOURNAL, JUNK, LOCAL_FAILURES,
-NOTES, OUTBOX, SENT, SERVER_FAILURES, SHORTCUTS, SYNC_ISSUES, TASKS, VIEWS).
-These special names can be used with private stores only; there are no names
-defined for public folder contents at this time. There is also no parsing
-support for slashes in folder names currently in mbop; the slash character is
-always treated as a hierarchy separator. Examples:
-.IP \(bu 4
-/Top of Information Store/Sent Items/2022
-.IP \(bu 4
-IPM_SUBTREE/Sent Items/2022
-.IP \(bu 4
-SENT/2022
+\fIfolder_spec\fP must conform to one of three forms. Either:
+.IP \(bu 4
+a numeric identifer (e.g. 13, 0xd)
+.IP \(bu 4
+a folder path starting with a slash, optionally followed by a slash-separated
+sequence of subordinate folder names
+.IP \(bu 4
+a folder path starting with a fixed symbolic name, optionally followed by a
+slash-separated sequence of subordinate folder names
+.PP
+The recognized strings are: CALENDAR, COMMON_VIEWS, CONFLICTS, CONTACTS,
+DEFERRED_ACTION, DELETED (TRASH, WASTEBASKET), DRAFT, FINDER, INBOX,
+IPM_SUBTREE, JOURNAL, JUNK, LOCAL_FAILURES, NOTES, OUTBOX, SENT,
+SERVER_FAILURES, SHORTCUTS, SYNC_ISSUES, TASKS, VIEWS.
+.PP
+The purpose of these names is for referencing a built-in folder irrespective of
+its assigned name, which is dependent upon translation settings. The symbolic
+names can be used with private stores only; there are no names defined for
+public folder contents at this time. There is also no parsing support for
+slashes in folder names. The slash character is always treated as a hierarchy
+separator.
+.SS Examples
+.IP \(bu 4
+Using the MAPI root: /Top of Information Store/Sent Items/2022
+.IP \(bu 4
+Using a symbolic name: IPM_SUBTREE/Sent Items/2022
+.IP \(bu 4
+Using a symbolic name: SENT/2022
 .SH See also
 \fBgromox\fP(7)

tools/genimport.cpp

@@ -600,6 +600,11 @@ static constexpr std::pair<const char *, uint8_t> fld_special_names[] = {
 
 eid_t gi_lookup_eid_by_name(const char *dir, const char *name)
 {
+	char *end = nullptr;
+	auto pure_id = strtoull(name, &end, 0);
+	if (end != name && *znul(end) == '\0')
+		return rop_util_make_eid_ex(1, pure_id);
+
 	auto pathcomp = gx_split(name, '/');
 	if (pathcomp.size() == 0)
 		return 0;

tools/mbop_delmsg.cpp

@@ -52,9 +52,7 @@ int main(int argc, char **argv)
 		return help();
 	std::vector<uint64_t> eids;
 	while (*++argv != nullptr) {
-		uint64_t id = strtoull(*argv, nullptr, 0);
-		eid_t eid = id == 0 ? gi_lookup_eid_by_name(g_storedir, *argv) :
-		            rop_util_make_eid_ex(1, id);
+		eid_t eid = gi_lookup_eid_by_name(g_storedir, *argv);
 		if (eid == 0) {
 			fprintf(stderr, "Not recognized/found: \"%s\"\n", *argv);
 			return EXIT_FAILURE;

tools/mbop_emptyfld.cpp

@@ -204,8 +204,7 @@ int main(int argc, char **argv)
 	while (*++argv != nullptr) {
 		BOOL partial = false;
 		uint64_t id = strtoull(*argv, nullptr, 0);
-		eid_t eid = id == 0 ? gi_lookup_eid_by_name(g_storedir, *argv) :
-		            rop_util_make_eid_ex(1, id);
+		eid_t eid = gi_lookup_eid_by_name(g_storedir, *argv);
 		if (eid == 0) {
 			fprintf(stderr, "Not recognized/found: \"%s\"\n", *argv);
 			return EXIT_FAILURE;

tools/mbop_purge.cpp

@@ -35,9 +35,7 @@ int main(int argc, char **argv)
 		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) {
-		uint64_t id = strtoull(*argv, nullptr, 0);
-		eid_t eid = id == 0 ? gi_lookup_eid_by_name(g_storedir, *argv) :
-		            rop_util_make_eid_ex(1, id);
+		eid_t eid = gi_lookup_eid_by_name(g_storedir, *argv);
 		if (eid == 0) {
 			fprintf(stderr, "Not recognized/found: \"%s\"\n", *argv);
 			return EXIT_FAILURE;