Remove usage of OPTION_DEBUG in sendfile funcs

diff --git a/etc/afpd/desktop.c b/etc/afpd/desktop.c
index 85b2e5327b36574217251ce6b4702a42f0934407..2a408467f1591badfe13eac47ea339c4e3484b0c 100644 (file)
--- a/etc/afpd/desktop.c
+++ b/etc/afpd/desktop.c
@@ -560,21 +560,19 @@ int afp_geticon(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t
          * a problem. much confusion results otherwise. */
         while (*rbuflen > 0) {
 #ifdef WITH_SENDFILE
-            if (!obj->options.flags & OPTION_DEBUG) {
-                if (dsi_stream_read_file(dsi, si.sdt_fd, offset, dsi->datasize) < 0) {
-                    switch (errno) {
-                    case ENOSYS:
-                    case EINVAL:  /* there's no guarantee that all fs support sendfile */
-                        break;
-                    default:
-                        goto geticon_exit;
-                    }
-                }
-                else {
-                    dsi_readdone(dsi);
-                    return AFP_OK;
+            if (dsi_stream_read_file(dsi, si.sdt_fd, offset, dsi->datasize) < 0) {
+                switch (errno) {
+                case ENOSYS:
+                case EINVAL:  /* there's no guarantee that all fs support sendfile */
+                    break;
+                default:
+                    goto geticon_exit;
                 }
             }
+            else {
+                dsi_readdone(dsi);
+                return AFP_OK;
+            }
 #endif
             buflen = read(si.sdt_fd, rbuf, *rbuflen);
             if (buflen < 0)

diff --git a/etc/afpd/fork.c b/etc/afpd/fork.c
index 62e620eff6b75609de17915a657120025f9bd796..319f33f2b727cf0239fc0b1382ca964a71361153 100644 (file)
--- a/etc/afpd/fork.c
+++ b/etc/afpd/fork.c
@@ -1210,29 +1210,27 @@ static int write_fork(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, s
     offset += cc;
 
 #if 0 /*def HAVE_SENDFILE_WRITE*/
-    if (!(obj->options.flags & OPTION_DEBUG)) {
-        if ((cc = ad_writefile(ofork->of_ad, eid, dsi->socket,
-                               offset, dsi->datasize)) < 0) {
-            switch (errno) {
-            case EDQUOT :
-            case EFBIG :
-            case ENOSPC :
-                cc = AFPERR_DFULL;
-                break;
-            default :
-                LOG(log_error, logtype_afpd, "afp_write: ad_writefile: %s", strerror(errno) );
-                goto afp_write_loop;
-            }
-            dsi_writeflush(dsi);
-            *rbuflen = 0;
-            ad_tmplock(ofork->of_ad, eid, ADLOCK_CLR, saveoff,
-                       reqcount,  ofork->of_refnum);
-            return cc;
+    if ((cc = ad_writefile(ofork->of_ad, eid, dsi->socket,
+                           offset, dsi->datasize)) < 0) {
+        switch (errno) {
+        case EDQUOT:
+        case EFBIG:
+        case ENOSPC:
+            cc = AFPERR_DFULL;
+            break;
+        default:
+            LOG(log_error, logtype_afpd, "afp_write: ad_writefile: %s", strerror(errno) );
+            goto afp_write_loop;
         }
-
-        offset += cc;
-        goto afp_write_done;
+        dsi_writeflush(dsi);
+        *rbuflen = 0;
+        ad_tmplock(ofork->of_ad, eid, ADLOCK_CLR, saveoff,
+                   reqcount,  ofork->of_refnum);
+        return cc;
     }
+
+    offset += cc;
+    goto afp_write_done;
 #endif /* 0, was HAVE_SENDFILE_WRITE */
 
     /* loop until everything gets written. currently