10
10
* Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me.
11
11
*
12
12
* IDENTIFICATION
13
- * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.39 2005/08/10 19:52:37 momjian Exp $
13
+ * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.40 2005/09/18 09:48:24 petere Exp $
14
14
*
15
15
*-------------------------------------------------------------------------
16
16
*/
@@ -141,20 +141,20 @@ pgrename(const char *from, const char *to)
141
141
pg_usleep (100000 ); /* us */
142
142
if (loops == 30 )
143
143
#ifndef FRONTEND
144
- elog (LOG , "could not rename \"%s\" to \"%s\", continuing to try" ,
144
+ elog (LOG , "could not rename file \"%s\" to \"%s\", continuing to try" ,
145
145
from , to );
146
146
#else
147
- fprintf (stderr , _ ("could not rename \"%s\" to \"%s\", continuing to try\n" ),
147
+ fprintf (stderr , _ ("could not rename file \"%s\" to \"%s\", continuing to try\n" ),
148
148
from , to );
149
149
#endif
150
150
loops ++ ;
151
151
}
152
152
153
153
if (loops > 30 )
154
154
#ifndef FRONTEND
155
- elog (LOG , "completed rename of \"%s\" to \"%s\"" , from , to );
155
+ elog (LOG , "completed rename of file \"%s\" to \"%s\"" , from , to );
156
156
#else
157
- fprintf (stderr , _ ("completed rename of \"%s\" to \"%s\"\n" ), from , to );
157
+ fprintf (stderr , _ ("completed rename of file \"%s\" to \"%s\"\n" ), from , to );
158
158
#endif
159
159
return 0 ;
160
160
}
@@ -181,20 +181,20 @@ pgunlink(const char *path)
181
181
pg_usleep (100000 ); /* us */
182
182
if (loops == 30 )
183
183
#ifndef FRONTEND
184
- elog (LOG , "could not unlink \"%s\", continuing to try" ,
184
+ elog (LOG , "could not remove file \"%s\", continuing to try" ,
185
185
path );
186
186
#else
187
- fprintf (stderr , _ ("could not unlink \"%s\", continuing to try\n" ),
187
+ fprintf (stderr , _ ("could not remove file \"%s\", continuing to try\n" ),
188
188
path );
189
189
#endif
190
190
loops ++ ;
191
191
}
192
192
193
193
if (loops > 30 )
194
194
#ifndef FRONTEND
195
- elog (LOG , "completed unlink of \"%s\"" , path );
195
+ elog (LOG , "completed removal of file \"%s\"" , path );
196
196
#else
197
- fprintf (stderr , _ ("completed unlink of \"%s\"\n" ), path );
197
+ fprintf (stderr , _ ("completed removal of file \"%s\"\n" ), path );
198
198
#endif
199
199
return 0 ;
200
200
}
0 commit comments