родитель
fa19095e26
Коммит
d15fe8d08e
@ -273,11 +273,11 @@ flags have the following meaning:
|
||||
|
||||
=item !
|
||||
|
||||
An error occured while reading this directory.
|
||||
An error occurred while reading this directory.
|
||||
|
||||
=item .
|
||||
|
||||
An error occured while reading a subdirectory, so the indicated size may not be
|
||||
An error occurred while reading a subdirectory, so the indicated size may not be
|
||||
correct.
|
||||
|
||||
=item <
|
||||
@ -286,7 +286,7 @@ File or directory is excluded from the statistics by using exlude patterns.
|
||||
|
||||
=item >
|
||||
|
||||
Directory is on an other filesystem.
|
||||
Directory is on another filesystem.
|
||||
|
||||
=item @
|
||||
|
||||
|
@ -195,7 +195,7 @@ static int delete_dir(struct dir *dr) {
|
||||
r = unlink(dr->name);
|
||||
|
||||
delete_nxt:
|
||||
/* error occured, ask user what to do */
|
||||
/* error occurred, ask user what to do */
|
||||
if(r == -1 && !ignoreerr) {
|
||||
state = DS_FAILED;
|
||||
lasterrno = errno;
|
||||
|
@ -123,7 +123,7 @@ void dir_curpath_set(const char *);
|
||||
void dir_curpath_enter(const char *);
|
||||
void dir_curpath_leave();
|
||||
|
||||
/* Sets the path where the last error occured, or reset on NULL. */
|
||||
/* Sets the path where the last error occurred, or reset on NULL. */
|
||||
void dir_setlasterr(const char *);
|
||||
|
||||
/* Error message on fatal error, or NULL if there hasn't been a fatal error yet. */
|
||||
|
@ -36,7 +36,7 @@ struct dir_output dir_output;
|
||||
char *dir_fatalerr; /* Error message on a fatal error. (NULL if there was no fatal error) */
|
||||
int dir_ui; /* User interface to use */
|
||||
static int confirm_quit_while_scanning_stage_1_passed; /* Additional check before quitting */
|
||||
static char *lasterr; /* Path where the last error occured. */
|
||||
static char *lasterr; /* Path where the last error occurred. */
|
||||
static int curpathl; /* Allocated length of dir_curpath */
|
||||
static int lasterrl; /* ^ of lasterr */
|
||||
|
||||
|
@ -81,7 +81,7 @@ struct ctx {
|
||||
|
||||
/* Fills readbuf with data from the stream. *buf will have at least n (<
|
||||
* READ_BUF_SIZE) bytes available, unless the stream reached EOF or an error
|
||||
* occured. If the file data contains a null-type, this is considered an error.
|
||||
* occurred. If the file data contains a null-type, this is considered an error.
|
||||
* Returns 0 on success, non-zero on error. */
|
||||
static int fill(int n) {
|
||||
int r;
|
||||
|
@ -84,7 +84,7 @@ static void stat_to_dir(struct stat *fs) {
|
||||
/* Reads all filenames in the currently chdir'ed directory and stores it as a
|
||||
* nul-separated list of filenames. The list ends with an empty filename (i.e.
|
||||
* two nuls). . and .. are not included. Returned memory should be freed. *err
|
||||
* is set to 1 if some error occured. Returns NULL if that error was fatal.
|
||||
* is set to 1 if some error occurred. Returns NULL if that error was fatal.
|
||||
* The reason for reading everything in memory first and then walking through
|
||||
* the list is to avoid eating too many file descriptors in a deeply recursive
|
||||
* directory. */
|
||||
|
@ -306,7 +306,7 @@ void dirlist_select(struct dir *d) {
|
||||
* 1 = selected has moved down
|
||||
* -1 = selected has moved up
|
||||
* -2 = selected = first item in the list (faster version of '1')
|
||||
* -3 = top should be considered as invalid (after sorting or opening an other dir)
|
||||
* -3 = top should be considered as invalid (after sorting or opening another dir)
|
||||
* -4 = an item has been deleted
|
||||
* -5 = hidden flag has been changed
|
||||
*
|
||||
|
@ -45,7 +45,7 @@
|
||||
#define FF_DIR 0x01
|
||||
#define FF_FILE 0x02
|
||||
#define FF_ERR 0x04 /* error while reading this item */
|
||||
#define FF_OTHFS 0x08 /* excluded because it was an other filesystem */
|
||||
#define FF_OTHFS 0x08 /* excluded because it was another filesystem */
|
||||
#define FF_EXL 0x10 /* excluded using exlude patterns */
|
||||
#define FF_SERR 0x20 /* error in subdirectory */
|
||||
#define FF_HLNKC 0x40 /* hard link candidate (file with st_nlink > 1) */
|
||||
|
@ -97,10 +97,10 @@ void help_draw() {
|
||||
ncaddch(10, 4, 'H');
|
||||
ncaddch(11, 4, 'e');
|
||||
uic_set(UIC_DEFAULT);
|
||||
ncaddstr( 5, 7, "An error occured while reading this directory");
|
||||
ncaddstr( 6, 7, "An error occured while reading a subdirectory");
|
||||
ncaddstr( 5, 7, "An error occurred while reading this directory");
|
||||
ncaddstr( 6, 7, "An error occurred while reading a subdirectory");
|
||||
ncaddstr( 7, 7, "File or directory is excluded from the statistics");
|
||||
ncaddstr( 8, 7, "Directory was on an other filesystem");
|
||||
ncaddstr( 8, 7, "Directory was on another filesystem");
|
||||
ncaddstr( 9, 7, "This is not a file nor a dir (symlink, socket, ...)");
|
||||
ncaddstr(10, 7, "Same file was already counted (hard link)");
|
||||
ncaddstr(11, 7, "Empty directory");
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user