mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tue Mar 17 23:58:40 1998 Pavel Machek <pavel@elf.ucw.cz>

Browse Source 
* src/file.c: Fix for the case where the disk gets full.
This commit is contained in:
Miguel de Icaza 1998-03-18 05:59:26 +00:00
parent 46e8d43127
commit 79a869ccb3
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
Tue Mar 17 23:58:40 1998 Pavel Machek <pavel@elf.ucw.cz>
* src/file.c: Fix for the case where the disk gets full.
Tue Mar 16 18:35:53 1998 Stas Maximov <stmax@u213.srcc.msu.su> Tue Mar 16 18:35:53 1998 Stas Maximov <stmax@u213.srcc.msu.su>
* src/hotlist.c default values for dialogs which add entries to hotlist * src/hotlist.c default values for dialogs which add entries to hotlist

18
src/file.c
View File

@ -25,6 +25,7 @@
1994, 1995, 1996 Miguel de Icaza 1994, 1995, 1996 Miguel de Icaza
1995, 1996 Jakub Jelinek 1995, 1996 Jakub Jelinek
1997 Norbert Warmuth 1997 Norbert Warmuth
1998 Pavel Machek
The copy code was based in GNU's cp, and was written by: The copy code was based in GNU's cp, and was written by:
Torbjorn Granlund, David MacKenzie, and Jim Meyering. Torbjorn Granlund, David MacKenzie, and Jim Meyering.
@ -1075,8 +1076,8 @@ copy_file_file (char *src_path, char *dst_path, int ask_overwrite)
goto ret; goto ret;
} }
resources |= 2; /* dst_path exists/dst_path opened */ resources |= 2; /* dst_path exists/dst_path opened */
resources |= 4; /* remove short file */
} }
resources |= 4; /* remove short file */
appending = do_append; appending = do_append;
do_append = 0; do_append = 0;
@ -1146,11 +1147,13 @@ copy_file_file (char *src_path, char *dst_path, int ask_overwrite)
for (i = 1; i;) { for (i = 1; i;) {
switch (size = mc_ctl (source_desc, MCCTL_REMOTECOPYCHUNK, 8192)) { switch (size = mc_ctl (source_desc, MCCTL_REMOTECOPYCHUNK, 8192)) {
case MCERR_TARGETOPEN: case MCERR_TARGETOPEN:
break; message_1s (1, " Error ", " Can't open target file ");
goto ret;
case MCERR_READ: case MCERR_READ:
break; goto ret;
case MCERR_WRITE: case MCERR_WRITE:
break; message_1s (1, " Error ", " Can't write to local target file ");
goto ret;
case MCERR_DATA_ON_STDIN: case MCERR_DATA_ON_STDIN:
break; break;
case MCERR_FINISH: case MCERR_FINISH:
@ -1158,13 +1161,6 @@ copy_file_file (char *src_path, char *dst_path, int ask_overwrite)
i = 0; i = 0;
break; break;
} }
if (size == MCERR_TARGETOPEN){
message_1s (1, " Error ", " Can't open target file ");
goto ret;
}
if (size == MCERR_READ)
goto ret;
if (i && size != MCERR_DATA_ON_STDIN){ if (i && size != MCERR_DATA_ON_STDIN){
n_read_total += size; n_read_total += size;