ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: normalize the indentation after the previous change 

Also, improve five comments.
master
Benno Schulenberg 2020-06-21 10:17:55 +02:00
parent 3dcabd6d03
commit 91ba76e1e0
1 changed files with 76 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
src/files.c
View File

@ -2510,107 +2510,105 @@ char *input_tab(char *buf, size_t *place, void (*refresh_func)(void), bool *list
return buf; return buf;
} }
const char *lastslash = revstrstr(buf, "/", buf + *place); const char *lastslash = revstrstr(buf, "/", buf + *place);
size_t length_of_path = (lastslash == NULL) ? 0 : lastslash - buf + 1; size_t length_of_path = (lastslash == NULL) ? 0 : lastslash - buf + 1;
size_t match, common_len = 0; size_t match, common_len = 0;
char *mzero, *glued; char *mzero, *glued;
char char1[MAXCHARLEN], char2[MAXCHARLEN]; char char1[MAXCHARLEN], char2[MAXCHARLEN];
int len1, len2; int len1, len2;
/* Get the number of characters that all matches have in common. */ /* Determine the number of characters that all matches have in common. */
while (TRUE) { while (TRUE) {
len1 = collect_char(matches[0] + common_len, char1); len1 = collect_char(matches[0] + common_len, char1);
for (match = 1; match < num_matches; match++) { for (match = 1; match < num_matches; match++) {
len2 = collect_char(matches[match] + common_len, char2); len2 = collect_char(matches[match] + common_len, char2);
if (len1 != len2 || strncmp(char1, char2, len2) != 0) if (len1 != len2 || strncmp(char1, char2, len2) != 0)
break;
}
if (match < num_matches || matches[0][common_len] == '\0')
break; break;
common_len += len1;
} }
mzero = charalloc(length_of_path + common_len + 1); if (match < num_matches || matches[0][common_len] == '\0')
break;
strncpy(mzero, buf, length_of_path); common_len += len1;
strncpy(mzero + length_of_path, matches[0], common_len); }
common_len += length_of_path; mzero = charalloc(length_of_path + common_len + 1);
mzero[common_len] = '\0';
/* Cover also the case of the user specifying a relative path. */ strncpy(mzero, buf, length_of_path);
glued = charalloc(strlen(present_path) + strlen(mzero) + 1); strncpy(mzero + length_of_path, matches[0], common_len);
sprintf(glued, "%s%s", present_path, mzero);
if (num_matches == 1 && (is_dir(mzero) || is_dir(glued))) common_len += length_of_path;
mzero[common_len++] = '/'; mzero[common_len] = '\0';
/* If the matches have something in common, show that part. */ /* Cover also the case of the user specifying a relative path. */
if (common_len != *place) { glued = charalloc(strlen(present_path) + strlen(mzero) + 1);
buf = charealloc(buf, common_len + 1); sprintf(glued, "%s%s", present_path, mzero);
memmove(buf + common_len, buf + *place, 1);
strncpy(buf, mzero, common_len); if (num_matches == 1 && (is_dir(mzero) || is_dir(glued)))
*place = common_len; mzero[common_len++] = '/';
/* If the matches have something in common, copy that part. */
if (common_len != *place) {
buf = charealloc(buf, common_len + 1);
memmove(buf + common_len, buf + *place, 1);
strncpy(buf, mzero, common_len);
*place = common_len;
}
/* If there is more than one possible completion, show a sorted list. */
if (num_matches > 1) {
size_t longest_name = 0, ncols;
int row = 0;
qsort(matches, num_matches, sizeof(char *), diralphasort);
/* Find the length of the longest name among the matches. */
for (match = 0; match < num_matches; match++) {
size_t namelen = breadth(matches[match]);
if (namelen > longest_name)
longest_name = namelen;
} }
if (num_matches > 1) { if (longest_name > COLS - 1)
size_t longest_name = 0, ncols; longest_name = COLS - 1;
int row = 0;
/* Sort the list of available choices. */ /* The columns of names will be separated by two spaces,
qsort(matches, num_matches, sizeof(char *), diralphasort); * but the last column will have just one space after it. */
ncols = (COLS + 1) / (longest_name + 2);
/* Find the length of the longest among the choices. */ /* Blank the edit window and hide the cursor. */
for (match = 0; match < num_matches; match++) { blank_edit();
size_t namelen = breadth(matches[match]); curs_set(0);
if (namelen > longest_name) /* Now print the list of matches out there. */
longest_name = namelen; for (match = 0; match < num_matches; match++) {
char *disp;
wmove(edit, row, (longest_name + 2) * (match % ncols));
if (row == editwinrows - 1 && num_matches - match > ncols) {
waddstr(edit, _("(more)"));
break;
} }
if (longest_name > COLS - 1) disp = display_string(matches[match], 0, longest_name, FALSE, FALSE);
longest_name = COLS - 1; waddstr(edit, disp);
free(disp);
/* Each column will be (longest_name + 2) columns wide, i.e. if ((match + 1) % ncols == 0)
* two spaces between columns, except that there will be row++;
* only one space after the last column. */
ncols = (COLS + 1) / (longest_name + 2);
/* Blank the edit window and hide the cursor. */
blank_edit();
curs_set(0);
/* Now print the list of matches out there. */
for (match = 0; match < num_matches; match++) {
char *disp;
wmove(edit, row, (longest_name + 2) * (match % ncols));
if (row == editwinrows - 1 && num_matches - match > ncols) {
waddstr(edit, _("(more)"));
break;
}
disp = display_string(matches[match], 0, longest_name, FALSE, FALSE);
waddstr(edit, disp);
free(disp);
if ((match + 1) % ncols == 0)
row++;
}
wnoutrefresh(edit);
*listed = TRUE;
} }
free(glued); wnoutrefresh(edit);
free(mzero); *listed = TRUE;
}
free_chararray(matches, num_matches); free_chararray(matches, num_matches);
free(glued);
free(mzero);
return buf; return buf;
} }