X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcommand.c;h=de77be80e8f95596e67c291309590691b84b2377;hb=c434e369b6695f8135a2914e9a425edcdd09ef35;hp=1e9fd570a6d8b3fbb0c7a11cb6d51273d2dda6ba;hpb=119676ae19d4f862cab6261936d1f6223f5534cc;p=pspp-builds.git diff --git a/src/command.c b/src/command.c index 1e9fd570..de77be80 100644 --- a/src/command.c +++ b/src/command.c @@ -305,7 +305,7 @@ static const char * find_word (const char *string, size_t *word_len) { /* Skip whitespace and asterisks. */ - while (isspace (*string)) + while (isspace ((unsigned char) *string)) string++; /* End of string? */ @@ -343,14 +343,14 @@ conflicting_3char_prefixes (const char *a, const char *b) assert (aw != NULL && bw != NULL); /* Words that are the same don't conflict. */ - if (aw_len == bw_len && !mm_case_compare (aw, bw, aw_len)) + if (aw_len == bw_len && !buf_compare_case (aw, bw, aw_len)) return 0; /* Words that are otherwise the same in the first three letters do conflict. */ return ((aw_len > 3 && bw_len > 3) || (aw_len == 3 && bw_len > 3) - || (bw_len == 3 && aw_len > 3)) && !mm_case_compare (aw, bw, 3); + || (bw_len == 3 && aw_len > 3)) && !buf_compare_case (aw, bw, 3); } /* Returns nonzero if CMD can be confused with another command @@ -392,7 +392,7 @@ cmd_match_words (const struct command *cmd, word != NULL && word_idx < word_cnt; word = find_word (word + word_len, &word_len), word_idx++) if (word_len != strlen (words[word_idx]) - || mm_case_compare (word, words[word_idx], word_len)) + || buf_compare_case (word, words[word_idx], word_len)) { size_t match_chars = match_strings (word, word_len, words[word_idx],