From 8ca03aa41488a9f08dffe64724eb04692174350c Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 20 Jul 2012 22:34:11 +0300 Subject: [PATCH] pg_dump: Simplify mkdir() error checking mkdir() can check for errors itself. We don't need to code that ourselves again. --- src/bin/pg_dump/pg_backup_directory.c | 35 +++------------------------ 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c index 796444421f..494dd07529 100644 --- a/src/bin/pg_dump/pg_backup_directory.c +++ b/src/bin/pg_dump/pg_backup_directory.c @@ -84,8 +84,6 @@ static void _LoadBlobs(ArchiveHandle *AH, RestoreOptions *ropt); static char *prependDirectory(ArchiveHandle *AH, const char *relativeFilename); -static void createDirectory(const char *dir); - /* * Init routine required by ALL formats. This is a global routine @@ -148,8 +146,9 @@ InitArchiveFmt_Directory(ArchiveHandle *AH) if (AH->mode == archModeWrite) { - /* Create the directory, errors are caught there */ - createDirectory(ctx->directory); + if (mkdir(ctx->directory, 0700) < 0) + exit_horribly(modulename, "could not create directory \"%s\": %s\n", + ctx->directory, strerror(errno)); } else { /* Read Mode */ @@ -628,34 +627,6 @@ _EndBlobs(ArchiveHandle *AH, TocEntry *te) ctx->blobsTocFH = NULL; } -static void -createDirectory(const char *dir) -{ - struct stat st; - - /* the directory must not exist yet. */ - if (stat(dir, &st) == 0) - { - if (S_ISDIR(st.st_mode)) - exit_horribly(modulename, - "cannot create directory %s, it exists already\n", - dir); - else - exit_horribly(modulename, - "cannot create directory %s, a file with this name " - "exists already\n", dir); - } - - /* - * Now we create the directory. Note that for some race condition we could - * also run into the situation that the directory has been created just - * between our two calls. - */ - if (mkdir(dir, 0700) < 0) - exit_horribly(modulename, "could not create directory %s: %s\n", - dir, strerror(errno)); -} - static char * prependDirectory(ArchiveHandle *AH, const char *relativeFilename) -- 2.40.0