|
9 | 9 | * |
10 | 10 | * |
11 | 11 | * IDENTIFICATION |
12 | | - * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.121 2003/08/04 02:39:58 momjian Exp $ |
| 12 | + * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.122 2003/09/10 20:24:09 tgl Exp $ |
13 | 13 | * |
14 | 14 | *------------------------------------------------------------------------- |
15 | 15 | */ |
@@ -354,19 +354,40 @@ createdb(const CreatedbStmt *stmt) |
354 | 354 | nominal_loc,alt_loc))); |
355 | 355 | } |
356 | 356 |
|
357 | | -/* Copy the template database to the new location */ |
| 357 | +/* |
| 358 | + * Copy the template database to the new location |
| 359 | + * |
| 360 | + * XXX use of cp really makes this code pretty grotty, particularly |
| 361 | + * with respect to lack of ability to report errors well. Someday |
| 362 | + * rewrite to do it for ourselves. |
| 363 | + */ |
358 | 364 | #ifndefWIN32 |
359 | 365 | snprintf(buf,sizeof(buf),"cp -r '%s' '%s'",src_loc,target_dir); |
360 | 366 | if (system(buf)!=0) |
361 | | -#else |
| 367 | +{ |
| 368 | +if (remove_dbdirs(nominal_loc,alt_loc)) |
| 369 | +ereport(ERROR, |
| 370 | +(errmsg("could not initialize database directory"), |
| 371 | +errdetail("Failing system command was: %s",buf), |
| 372 | +errhint("Look in the postmaster's stderr log for more information."))); |
| 373 | +else |
| 374 | +ereport(ERROR, |
| 375 | +(errmsg("could not initialize database directory; delete failed as well"), |
| 376 | +errdetail("Failing system command was: %s",buf), |
| 377 | +errhint("Look in the postmaster's stderr log for more information."))); |
| 378 | +} |
| 379 | +#else/* WIN32 */ |
362 | 380 | if (copydir(src_loc,target_dir)!=0) |
363 | | -#endif |
364 | 381 | { |
| 382 | +/* copydir should already have given details of its troubles */ |
365 | 383 | if (remove_dbdirs(nominal_loc,alt_loc)) |
366 | | -elog(ERROR,"could not initialize database directory"); |
| 384 | +ereport(ERROR, |
| 385 | +(errmsg("could not initialize database directory"))); |
367 | 386 | else |
368 | | -elog(ERROR,"could not initialize database directory; delete failed as well"); |
| 387 | +ereport(ERROR, |
| 388 | +(errmsg("could not initialize database directory; delete failed as well"))); |
369 | 389 | } |
| 390 | +#endif/* WIN32 */ |
370 | 391 |
|
371 | 392 | /* |
372 | 393 | * Now OK to grab exclusive lock on pg_database. |
@@ -935,9 +956,10 @@ remove_dbdirs(const char *nominal_loc, const char *alt_loc) |
935 | 956 | if (system(buf)!=0) |
936 | 957 | { |
937 | 958 | ereport(WARNING, |
938 | | -(errcode_for_file_access(), |
939 | | -errmsg("could not remove database directory \"%s\": %m", |
940 | | -target_dir))); |
| 959 | +(errmsg("could not remove database directory \"%s\"", |
| 960 | +target_dir), |
| 961 | +errdetail("Failing system command was: %s",buf), |
| 962 | +errhint("Look in the postmaster's stderr log for more information."))); |
941 | 963 | success= false; |
942 | 964 | } |
943 | 965 |
|
|