Imported Upstream version 2.6.1

[debian/amanda] / oldrecover-src / extract_list.c

diff --git a/oldrecover-src/extract_list.c b/oldrecover-src/extract_list.c
index 61c9a6aa695e2e6aa2f33785560ea9496d08713b..d1d89556bda5af8b6137410e6b94cfe6cffe3b21 100644 (file)
--- a/oldrecover-src/extract_list.c
+++ b/oldrecover-src/extract_list.c
@@ -1254,7 +1254,7 @@ okay_to_continue(
            break;
        }
        s = line;
-       while ((ch = *s++) != '\0' && isspace(ch)) {
+       while ((ch = *s++) != '\0' && g_ascii_isspace(ch)) {
            (void)ch;  /* Quiet empty loop body warning */
        }
        if (ch == '?') {
@@ -1301,9 +1301,9 @@ send_to_tape_server(
 {
     char *msg = stralloc2(cmd, "\r\n");
 
-    if (fullwrite(tss, msg, strlen(msg)) < 0)
+    if (full_write(tss, msg, strlen(msg)) < strlen(msg))
     {
-       error(_("Error writing to tape server"));
+       error(_("Error writing to tape server: %s"), strerror(errno));
        /*NOTREACHED*/
     }
     amfree(msg);
@@ -1447,7 +1447,7 @@ extract_files_setup(
        am_has_feature(indexsrv_features, fe_amidxtaped_datestamp)) {
 
        if(am_has_feature(indexsrv_features, fe_amidxtaped_config)) {
-           tt = newstralloc2(tt, "CONFIG=", config_name);
+           tt = newstralloc2(tt, "CONFIG=", config);
            send_to_tape_server(tape_control_sock, tt);
        }
        if(am_has_feature(indexsrv_features, fe_amidxtaped_label) &&
@@ -1874,7 +1874,7 @@ writer_intermediary(
     int child_pipe[2];
     pid_t pid;
     char buffer[DISK_BLOCK_BYTES];
-    ssize_t bytes_read;
+    size_t bytes_read;
     amwait_t extractor_status;
     int max_fd, nfound;
     SELECT_ARG_TYPE readset, selectset;
@@ -2014,7 +2014,7 @@ writer_intermediary(
                  * spit what we got from the server to the child
                  *  process handling actual dumpfile extraction
                  */
-                if(fullwrite(child_pipe[1], buffer, (size_t)bytes_read) < 0) {
+                if(full_write(child_pipe[1], buffer, bytes_read) < bytes_read) {
                     if(errno == EPIPE) {
                         error(_("pipe data reader has quit: %s\n"),
                               strerror(errno));