Changeset 1356 in kBuild

Timestamp:

Dec 3, 2007 1:44:35 AM (17 years ago)

Author:

bird

Message:

Fixed busted --changed implementation. It leaked a handle if the files matched and didn't rewind on mismatch.

File:

• trunk/src/kmk/kmkbuiltin/cp_utils.c (modified) (1 diff)

trunk/src/kmk/kmkbuiltin/cp_utils.c

@@ -111 +111 @@
         if (!dne) {
                 /* compare the files first if requested */
-                if (    changed_only
-                    &&  cmp_fd_and_file(from_fd, entp->fts_path, to.p_path,
-                                        1 /* silent */, 0 /* lflag */,
-                                        0 /* special */)
-                        == OK_EXIT) {
-                        return (0);
+                if (changed_only) {
+                        if (cmp_fd_and_file(from_fd, entp->fts_path, to.p_path,
+                                            1 /* silent */, 0 /* lflag */,
+                                            0 /* special */) == OK_EXIT) {
+                                close(from_fd);
+                                return (0);
+                        }
+                        if (lseek(from_fd, 0, SEEK_SET) != 0) {
+                                close(from_fd);
+                                if ((from_fd = open(entp->fts_path, O_RDONLY | O_BINARY, 0)) == -1) {
+                                        warn("%s", entp->fts_path);
+                                        return (1);
+                                }
+                        }
                 }