sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-06 00:02:36 -04:00
Code Issues Projects Releases Wiki Activity

Use ReadDir() not readdir() so as to have some modicum of error checking.

Browse Source
This commit is contained in:
Tom Lane 2005-08-02 15:17:24 +00:00
parent 74888b9349
commit f023fc6689
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/utils/adt/dbsize.c
View File

@ -1,11 +1,11 @@
/* /*
* dbsize.c * dbsize.c
* object size functions * object size functions
* *
* Copyright (c) 2002-2005, PostgreSQL Global Development Group * Copyright (c) 2002-2005, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.2 2005/08/02 14:07:27 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.3 2005/08/02 15:17:24 tgl Exp $
* *
*/ */
@ -40,7 +40,7 @@ db_dir_size(const char *path)
if (!dirdesc) if (!dirdesc)
return 0; return 0;
while ((direntry = readdir(dirdesc)) != NULL) while ((direntry = ReadDir(dirdesc, path)) != NULL)
{ {
struct stat fst; struct stat fst;
@ -71,6 +71,7 @@ calculate_database_size(Oid dbOid)
int64 totalsize = 0; int64 totalsize = 0;
DIR *dirdesc; DIR *dirdesc;
struct dirent *direntry; struct dirent *direntry;
char dirpath[MAXPGPATH];
char pathname[MAXPGPATH]; char pathname[MAXPGPATH];
/* Shared storage in pg_global is not counted */ /* Shared storage in pg_global is not counted */
@ -80,15 +81,15 @@ calculate_database_size(Oid dbOid)
totalsize += db_dir_size(pathname); totalsize += db_dir_size(pathname);
/* Scan the non-default tablespaces */ /* Scan the non-default tablespaces */
snprintf(pathname, MAXPGPATH, "%s/pg_tblspc", DataDir); snprintf(dirpath, MAXPGPATH, "%s/pg_tblspc", DataDir);
dirdesc = AllocateDir(pathname); dirdesc = AllocateDir(dirpath);
if (!dirdesc) if (!dirdesc)
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not open tablespace directory \"%s\": %m", errmsg("could not open tablespace directory \"%s\": %m",
pathname))); dirpath)));
while ((direntry = readdir(dirdesc)) != NULL) while ((direntry = ReadDir(dirdesc, dirpath)) != NULL)
{ {
if (strcmp(direntry->d_name, ".") == 0 || if (strcmp(direntry->d_name, ".") == 0 ||
strcmp(direntry->d_name, "..") == 0) strcmp(direntry->d_name, "..") == 0)
@ -161,7 +162,7 @@ calculate_tablespace_size(Oid tblspcOid)
errmsg("could not open tablespace directory \"%s\": %m", errmsg("could not open tablespace directory \"%s\": %m",
tblspcPath))); tblspcPath)));
while ((direntry = readdir(dirdesc)) != NULL) while ((direntry = ReadDir(dirdesc, tblspcPath)) != NULL)
{ {
struct stat fst; struct stat fst;