author | ar <ar> | 2004-06-13 16:42:19 (UTC) |
---|---|---|
committer | ar <ar> | 2004-06-13 16:42:19 (UTC) |
commit | 07d700581b9f608d3105eb8d82d9b4cfa0084317 (patch) (unidiff) | |
tree | f9f08fcab03ebf0df470b9cc88d6f8c59de2c9cb | |
parent | b1235df3628d178891eeefed630a22da46b25952 (diff) | |
download | opie-07d700581b9f608d3105eb8d82d9b4cfa0084317.zip opie-07d700581b9f608d3105eb8d82d9b4cfa0084317.tar.gz opie-07d700581b9f608d3105eb8d82d9b4cfa0084317.tar.bz2 |
- fix erro-handling err == -1 -> err != -1
-rw-r--r-- | library/filemanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/filemanager.cpp b/library/filemanager.cpp index 1e7384e..99837fe 100644 --- a/library/filemanager.cpp +++ b/library/filemanager.cpp | |||
@@ -245,65 +245,65 @@ bool FileManager::copyFile( const QString & src, const QString & dest ) { | |||
245 | int err=0; | 245 | int err=0; |
246 | QString msg; | 246 | QString msg; |
247 | #ifdef Q_OS_MACX | 247 | #ifdef Q_OS_MACX |
248 | #ifdef SENDFILE | 248 | #ifdef SENDFILE |
249 | /* FreeBSD does support a different kind of | 249 | /* FreeBSD does support a different kind of |
250 | * sendfile. (eilers) | 250 | * sendfile. (eilers) |
251 | * I took this from Very Secure FTPd | 251 | * I took this from Very Secure FTPd |
252 | * Licence: GPL | 252 | * Licence: GPL |
253 | * Author: Chris Evans | 253 | * Author: Chris Evans |
254 | * sysdeputil.c | 254 | * sysdeputil.c |
255 | */ | 255 | */ |
256 | /* XXX - start_pos will truncate on 32-bit machines - can we | 256 | /* XXX - start_pos will truncate on 32-bit machines - can we |
257 | * say "start from current pos"? | 257 | * say "start from current pos"? |
258 | */ | 258 | */ |
259 | off_t written = 0; | 259 | off_t written = 0; |
260 | int retval = 0; | 260 | int retval = 0; |
261 | retval = sendfile(read_fd, write_fd, offset, stat_buf.st_size, NULL, | 261 | retval = sendfile(read_fd, write_fd, offset, stat_buf.st_size, NULL, |
262 | &written, 0); | 262 | &written, 0); |
263 | /* Translate to Linux-like retval */ | 263 | /* Translate to Linux-like retval */ |
264 | if (written > 0) | 264 | if (written > 0) |
265 | { | 265 | { |
266 | err = (int) written; | 266 | err = (int) written; |
267 | } | 267 | } |
268 | #else /* SENDFILE */ | 268 | #else /* SENDFILE */ |
269 | err == -1; | 269 | err == -1; |
270 | msg = "FAILURE: Using unsupported function \"sendfile()\" Need Workaround !!"; | 270 | msg = "FAILURE: Using unsupported function \"sendfile()\" Need Workaround !!"; |
271 | success = false; | 271 | success = false; |
272 | # warning "Need workaround for sendfile!!(eilers)" | 272 | # warning "Need workaround for sendfile!!(eilers)" |
273 | #endif /* SENDFILE */ | 273 | #endif /* SENDFILE */ |
274 | 274 | ||
275 | #else | 275 | #else |
276 | err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size); | 276 | err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size); |
277 | if( err == -1) { | 277 | if( err != -1) { |
278 | switch(err) { | 278 | switch(err) { |
279 | case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. "; | 279 | case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. "; |
280 | case EINVAL: msg = "Descriptor is not valid or locked. "; | 280 | case EINVAL: msg = "Descriptor is not valid or locked. "; |
281 | case ENOMEM: msg = "Insufficient memory to read from in_fd."; | 281 | case ENOMEM: msg = "Insufficient memory to read from in_fd."; |
282 | case EIO: msg = "Unspecified error while reading from in_fd."; | 282 | case EIO: msg = "Unspecified error while reading from in_fd."; |
283 | }; | 283 | }; |
284 | success = false; | 284 | success = false; |
285 | } | 285 | } |
286 | #endif /* Q_OS_MACX */ | 286 | #endif /* Q_OS_MACX */ |
287 | if( !success ) | 287 | if( !success ) |
288 | qWarning( msg ); | 288 | qWarning( msg ); |
289 | } else { | 289 | } else { |
290 | qWarning("open write failed %s, %s",src.latin1(), dest.latin1()); | 290 | qWarning("open write failed %s, %s",src.latin1(), dest.latin1()); |
291 | success = false; | 291 | success = false; |
292 | } | 292 | } |
293 | } else { | 293 | } else { |
294 | qWarning("open read failed %s, %s",src.latin1(), dest.latin1()); | 294 | qWarning("open read failed %s, %s",src.latin1(), dest.latin1()); |
295 | success = false; | 295 | success = false; |
296 | } | 296 | } |
297 | srcFile.close(); | 297 | srcFile.close(); |
298 | destFile.close(); | 298 | destFile.close(); |
299 | // Set file permissions | 299 | // Set file permissions |
300 | if( stat( (const char *) src, &status ) == 0 ) { | 300 | if( stat( (const char *) src, &status ) == 0 ) { |
301 | chmod( (const char *) dest, status.st_mode ); | 301 | chmod( (const char *) dest, status.st_mode ); |
302 | } | 302 | } |
303 | 303 | ||
304 | return success; | 304 | return success; |
305 | } | 305 | } |
306 | 306 | ||
307 | 307 | ||
308 | bool FileManager::renameFile( const QString & src, const QString & dest ) { | 308 | bool FileManager::renameFile( const QString & src, const QString & dest ) { |
309 | if(copyFile( src, dest )) { | 309 | if(copyFile( src, dest )) { |