Merge pull request #18932 from poettering/filename-max

Drop use of FILENAME_MAX
2021-03-09 14:15:49 +09:00
parent 03a81441b1 698660620d
commit 2eaed57bd4
8 changed files with 34 additions and 21 deletions
@@ -809,10 +809,8 @@ bool efi_has_tpm2(void) {
 #endif

 bool efi_loader_entry_name_valid(const char *s) {
-        if (isempty(s))
-                return false;

-        if (strlen(s) > FILENAME_MAX) /* Make sure entry names fit in filenames */
+        if (!filename_is_valid(s)) /* Make sure entry names fit in filenames */
                return false;

        return in_charset(s, ALPHANUMERICAL "+-_.");