// non-digit characters. For instance, if InString is "foo-3.3.4-7.img",
// this function returns "3.3.4-7". If InString contains no digits,
// the return value is NULL.
+// As a special case for Arch Linux the strings "linux" and "linux-lts"
+// are considered to be digits.
CHAR16 *FindNumbers(IN CHAR16 *InString) {
- UINTN i, StartOfElement, EndOfElement = 0, CopyLength;
+ UINTN i, StartOfElement = 0, EndOfElement = 0, CopyLength;
CHAR16 *Found = NULL;
if (InString == NULL)
return NULL;
- StartOfElement = StrLen(InString);
+ // Find "linux-lts" or "linux"
+ Found = MyStrStr(InString, L"linux-lts");
+ if (Found != NULL) {
+ StartOfElement = Found - InString;
+ EndOfElement = StartOfElement + StrLen(L"linux-lts") - 1;
+ } else {
+ Found = MyStrStr(InString, L"linux");
+ if (Found != NULL) {
+ StartOfElement = Found - InString;
+ EndOfElement = StartOfElement + StrLen(L"linux") - 1;
+ } // if
+ } // if/else
+ Found = NULL;
+
// Find start & end of target element
for (i = 0; InString[i] != L'\0'; i++) {
if ((InString[i] >= L'0') && (InString[i] <= L'9')) {
EndOfElement = i;
} // if
} // for
+
// Extract the target element
if (EndOfElement > 0) {
if (EndOfElement >= StartOfElement) {
return Found;
} // BOOLEAN IsSubstringIn()
-// Replace *SearchString in **MainString with *ReplString.
+// Replace *SearchString in **MainString with *ReplString -- but if *SearchString
+// is preceded by "%", instead remove that character.
// Returns TRUE if replacement was done, FALSE otherwise.
BOOLEAN ReplaceSubstring(IN OUT CHAR16 **MainString, IN CHAR16 *SearchString, IN CHAR16 *ReplString) {
BOOLEAN WasReplaced = FALSE;
if (NewString) {
EndString = &(FoundSearchString[StrLen(SearchString)]);
FoundSearchString[0] = L'\0';
+ if ((FoundSearchString > *MainString) && (FoundSearchString[-1] == L'%')) {
+ FoundSearchString[-1] = L'\0';
+ ReplString = SearchString;
+ } // if
StrCpy(NewString, *MainString);
MergeStrings(&NewString, ReplString, L'\0');
MergeStrings(&NewString, EndString, L'\0');