X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Flink-follow.m4;h=256b2a99d8bcde4bd9d8aae13d742b5453fe64b9;hb=e967460a14f47cdab5ff7d71fbcaee71e00c330b;hp=48885eae48346220fd629651bda2909f68e9f183;hpb=8a0efd04dc9583c96b4a0d3c311ff216e07dcdcd;p=gnulib.git

diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index 48885eae4..256b2a99d 100644
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -1,8 +1,8 @@
-# serial 14
+# serial 15
 dnl Run a program to determine whether link(2) follows symlinks.
 dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
 
-# Copyright (C) 1999-2001, 2004-2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1999-2001, 2004-2006, 2009-2010 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -23,7 +23,7 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK],
   gl_link_follows_symlinks=0 # assume GNU behavior
   if test $ac_cv_func_readlink = yes; then
     AC_CACHE_CHECK([whether link(2) dereferences a symlink],
-		    gl_cv_func_link_follows_symlink,
+                    gl_cv_func_link_follows_symlink,
     [
       # Create a regular file.
       echo > conftest.file
@@ -34,39 +34,40 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK],
 #       include <stdlib.h>
 
 #       define SAME_INODE(Stat_buf_1, Stat_buf_2) \
-	  ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \
-	   && (Stat_buf_1).st_dev == (Stat_buf_2).st_dev)
+          ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \
+           && (Stat_buf_1).st_dev == (Stat_buf_2).st_dev)
 
-	int
-	main ()
-	{
-	  const char *file = "conftest.file";
-	  const char *sym = "conftest.sym";
-	  const char *hard = "conftest.hard";
-	  struct stat sb_file, sb_hard;
+        int
+        main ()
+        {
+          const char *file = "conftest.file";
+          const char *sym = "conftest.sym";
+          const char *hard = "conftest.hard";
+          struct stat sb_file, sb_hard;
 
-	  /* Create a symlink to the regular file. */
-	  if (symlink (file, sym))
-	    abort ();
+          /* Create a symlink to the regular file. */
+          if (symlink (file, sym))
+            return 2;
 
-	  /* Create a hard link to that symlink.  */
-	  if (link (sym, hard))
-	    abort ();
+          /* Create a hard link to that symlink.  */
+          if (link (sym, hard))
+            return 3;
 
-	  if (lstat (hard, &sb_hard))
-	    abort ();
-	  if (lstat (file, &sb_file))
-	    abort ();
+          if (lstat (hard, &sb_hard))
+            return 4;
+          if (lstat (file, &sb_file))
+            return 5;
 
-	  /* If the dev/inode of hard and file are the same, then
-	     the link call followed the symlink.  */
-	  return SAME_INODE (sb_hard, sb_file) ? 1 : 0;
-	}
+          /* If the dev/inode of hard and file are the same, then
+             the link call followed the symlink.  */
+          return SAME_INODE (sb_hard, sb_file) ? 1 : 0;
+        }
       ]])],
-	[gl_cv_func_link_follows_symlink=no], dnl GNU behavior
-	[gl_cv_func_link_follows_symlink=yes], dnl Followed link/compile failed
-	[gl_cv_func_link_follows_symlink=unknown] dnl We're cross compiling.
+        [gl_cv_func_link_follows_symlink=no], dnl GNU behavior
+        [gl_cv_func_link_follows_symlink=yes], dnl Followed link/compile failed
+        [gl_cv_func_link_follows_symlink=unknown] dnl We're cross compiling.
       )
+      rm -f conftest.file conftest.sym conftest.hard
     ])
     case $gl_cv_func_link_follows_symlink in
       yes) gl_link_follows_symlinks=1 ;;