11/*
22 * dbsize.c
3- *
3+ *
44 *
55 * Copyright (c) 2002-2005, PostgreSQL Global Development Group
66 *
77 * IDENTIFICATION
8- * $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.2 2005/08/0214:07:27 tgl Exp $
8+ * $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.3 2005/08/0215:17:24 tgl Exp $
99 *
1010 */
1111
@@ -40,7 +40,7 @@ db_dir_size(const char *path)
4040if (!dirdesc )
4141return 0 ;
4242
43- while ((direntry = readdir (dirdesc ))!= NULL )
43+ while ((direntry = ReadDir (dirdesc , path ))!= NULL )
4444{
4545struct stat fst ;
4646
@@ -71,6 +71,7 @@ calculate_database_size(Oid dbOid)
7171int64 totalsize = 0 ;
7272DIR * dirdesc ;
7373struct dirent * direntry ;
74+ char dirpath [MAXPGPATH ];
7475char pathname [MAXPGPATH ];
7576
7677/* Shared storage in pg_global is not counted */
@@ -80,15 +81,15 @@ calculate_database_size(Oid dbOid)
8081totalsize += db_dir_size (pathname );
8182
8283/* Scan the non-default tablespaces */
83- snprintf (pathname ,MAXPGPATH ,"%s/pg_tblspc" ,DataDir );
84- dirdesc = AllocateDir (pathname );
84+ snprintf (dirpath ,MAXPGPATH ,"%s/pg_tblspc" ,DataDir );
85+ dirdesc = AllocateDir (dirpath );
8586if (!dirdesc )
8687ereport (ERROR ,
8788(errcode_for_file_access (),
8889errmsg ("could not open tablespace directory \"%s\": %m" ,
89- pathname )));
90+ dirpath )));
9091
91- while ((direntry = readdir (dirdesc ))!= NULL )
92+ while ((direntry = ReadDir (dirdesc , dirpath ))!= NULL )
9293{
9394if (strcmp (direntry -> d_name ,"." )== 0 ||
9495strcmp (direntry -> d_name ,".." )== 0 )
@@ -161,7 +162,7 @@ calculate_tablespace_size(Oid tblspcOid)
161162errmsg ("could not open tablespace directory \"%s\": %m" ,
162163tblspcPath )));
163164
164- while ((direntry = readdir (dirdesc ))!= NULL )
165+ while ((direntry = ReadDir (dirdesc , tblspcPath ))!= NULL )
165166{
166167struct stat fst ;
167168