From 44623f67a124c4c77f7ff8097f13e116d20d83a5 Mon Sep 17 00:00:00 2001 From: Marco Nenciarini Date: Thu, 29 Jan 2015 16:45:27 +0100 Subject: [PATCH] Update pg_check_dir comment --- src/port/pgcheckdir.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/port/pgcheckdir.c b/src/port/pgcheckdir.c index 7061893..9165ebb 100644 *** a/src/port/pgcheckdir.c --- b/src/port/pgcheckdir.c *************** *** 22,28 **** * Returns: * 0 if nonexistent * 1 if exists and empty ! * 2 if exists and not empty * -1 if trouble accessing directory (errno reflects the error) */ int --- 22,30 ---- * Returns: * 0 if nonexistent * 1 if exists and empty ! * 2 if exists and contains _only_ dot files ! * 3 if exists and contains a mount point ! * 4 if exists and not empty * -1 if trouble accessing directory (errno reflects the error) */ int *************** pg_check_dir(const char *dir) *** 32,37 **** --- 34,40 ---- DIR *chkdir; struct dirent *file; bool dot_found = false; + bool mount_found = false; chkdir = opendir(dir); if (chkdir == NULL) *************** pg_check_dir(const char *dir) *** 51,60 **** { dot_found = true; } else if (strcmp("lost+found", file->d_name) == 0) { ! result = 3; /* not empty, mount point */ ! break; } #endif else --- 54,63 ---- { dot_found = true; } + /* lost+found directory */ else if (strcmp("lost+found", file->d_name) == 0) { ! mount_found = true; } #endif else *************** pg_check_dir(const char *dir) *** 67,72 **** --- 70,79 ---- if (errno || closedir(chkdir)) result = -1; /* some kind of I/O error? */ + /* We report on mount point if we find a lost+found directory */ + if (result == 1 && mount_found) + result = 3; + /* We report on dot-files if we _only_ find dot files */ if (result == 1 && dot_found) result = 2; -- 2.2.2