Merge lp:~fehwalker/ubuntu/raring/ureadahead/fix-969926 into lp:ubuntu/raring/ureadahead

[Bryan Fullerton]

Updated to remove extraneous stat() call as requested, tested working as expected on raring.

[Serge Hallyn (serge-hallyn)]

Thanks for submitting this patch. I did have one question. Is there any value to keeping the third check, the stat() call? If stat were going to fail, then lstat would also fail, so I think the check can simply become

if ((lstat (pathname, &statbuf) < 0)
     || S_ISLNK (statbuf.st_mode)
     || (! S_ISREG(statbuf.st_mode)))
 return 0;

I certainly could be wrong :) if so please let me know.

review: Needs Fixing

[Bryan Fullerton (fehwalker)]

I think you might be right. I was attempting to not change the logic too much from the original, but probably it is redundant.

I won't be in a position to rebuild and test locally until tomorrow, will update either way then.

Thanks for the review!

[Serge Hallyn (serge-hallyn)]

Thanks, this looks good to me. Note lp reports a conflict, but that is only with changelog so shouldn't slow anyone down.

I unfortunately don't have upload rights, so all I can do it mark that I have reviewed and Approve.

Thanks Bryan!

review: Approve

[Martin Pitt (pitti)]

Looks good, thanks! Merging/uploading.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-12 15:35:42 +0000
+++ debian/changelog	2013-03-14 18:06:20 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ureadahead (0.100.0-15) raring; urgency=low
 
   * src/ureadahead.c: correct help text for --sort command line argument
@@ -7,6 +8,15 @@
 
  -- Bryan Fullerton <[e-mail]>  Tue, 12 Mar 2013 15:06:41 +0000
 
+=======
+ureadahead (0.100.0-14ubuntu2) UNRELEASED; urgency=low
+
+  * src/trace.c: update to ignore symlinks when tracing + cleanup extra stat()
+    (LP: #969926)
+
+ -- Bryan Fullerton <[e-mail]>  Thu, 14 Mar 2013 14:01:56 -0400
+
+>>>>>>> MERGE-SOURCE
 ureadahead (0.100.0-14) raring; urgency=low
 
   * Use dh-autoreconf to ensure (among other things) that config.guess and

=== modified file 'src/trace.c'
--- src/trace.c	2013-03-02 07:47:41 +0000
+++ src/trace.c	2013-03-14 18:06:20 +0000
@@ -490,12 +490,11 @@
 		nih_hash_add (path_hash, &entry->entry);
 	}
 
-	/* Make sure that we have an ordinary file, or a symlink to an
-	 * ordinary file.  This avoids us opening a fifo or socket.
+	/* Make sure that we have an ordinary file
+	 * This avoids us opening a fifo or socket or symlink.
 	 */
 	if ((lstat (pathname, &statbuf) < 0)
-	    || (S_ISLNK (statbuf.st_mode)
-		&& (stat (pathname, &statbuf) < 0))
+	    || (S_ISLNK (statbuf.st_mode))
 	    || (! S_ISREG (statbuf.st_mode)))
 		return 0;