Update warning message for missing newline at end of fuse.conf

diff --git a/ChangeLog b/ChangeLog
index 4d75d553fe8098ddead0de55aeab94878514be70..7a2344eccc0cec447d9d9f3101b008320c8f81a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-09  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Update warning message for missing newline at end of fuse.conf
+
+       * Update debug message for successful operation to not include the
+       string "error:"
+
 2008-04-08  Miklos Szeredi <miklos@szeredi.hu>
 
        * Update error message for missing mountpoint parameter.  Reported

diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index d4941b4bfd37fbc32810190d0646585e9f74674a..bae6199e5bb19a56840e8a85409db9788c1446fc 100644 (file)
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -167,11 +167,18 @@ static int send_reply_iov(fuse_req_t req, int error, struct iovec *iov,
        iov[0].iov_len = sizeof(struct fuse_out_header);
        out.len = iov_length(iov, count);
 
-       if (req->f->debug)
-               fprintf(stderr,
-                       "   unique: %llu, error: %i (%s), outsize: %i\n",
-                       (unsigned long long) out.unique, out.error,
-                       strerror(-out.error), out.len);
+       if (req->f->debug) {
+               if (out.error) {
+                       fprintf(stderr,
+                               "   unique: %llu, error: %i (%s), outsize: %i\n",
+                               (unsigned long long) out.unique, out.error,
+                               strerror(-out.error), out.len);
+               } else {
+                       fprintf(stderr,
+                               "   unique: %llu, success, outsize: %i\n",
+                               (unsigned long long) out.unique, out.len);
+               }
+       }
        res = fuse_chan_send(req->ch, iov, count);
        free_req(req);
 

diff --git a/util/fusermount.c b/util/fusermount.c
index 12e0c9fb9077c1166cdab5fff009fe6672df5044..773de36fe019a30846f7b73a754956a58d79a1da 100644 (file)
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -229,15 +229,20 @@ static void read_conf(void)
                                        strip_line(line);
                                        parse_line(line, linenum);
                                } else {
-                                       fprintf(stderr, "%s: reading %s: line %i too long\n",
-                                               progname, FUSE_CONF, linenum);
                                        isnewline = 0;
                                }
-                       } else if(line[strlen(line)-1] == '\n')
+                       } else if(line[strlen(line)-1] == '\n') {
+                               fprintf(stderr, "%s: reading %s: line %i too long\n", progname, FUSE_CONF, linenum);
+
                                isnewline = 1;
+                       }
                        if (isnewline)
                                linenum ++;
                }
+               if (!isnewline) {
+                       fprintf(stderr, "%s: reading %s: missing newline at end of file\n", progname, FUSE_CONF);
+
+               }
                fclose(fp);
        } else if (errno != ENOENT) {
                fprintf(stderr, "%s: failed to open %s: %s\n",