diff options
author | Bruno Haible <bruno@clisp.org> | 2003-01-14 13:51:17 +0000 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2003-01-14 13:51:17 +0000 |
commit | e5894c7e1bab7b9c1f5f7bb2f3737bcf9253be68 (patch) | |
tree | b69b8b5b325c988448a89510170e85b69198780a | |
parent | 40ea7eb653ee5210733a9c5abe0d4a5fd52bc703 (diff) | |
download | gnulib-e5894c7e1bab7b9c1f5f7bb2f3737bcf9253be68.tar.gz |
Optimization: Avoid unnecessary stat() calls.
-rw-r--r-- | lib/ChangeLog | 5 | ||||
-rw-r--r-- | lib/same.c | 60 |
2 files changed, 38 insertions, 27 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 7b1cd59869..a0e46abc0e 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,10 @@ 2003-01-11 Bruno Haible <bruno@clisp.org> + * same.c (same_name): Reorder tests so as to avoid calling stat() + when a string comparison is sufficient. + +2003-01-11 Bruno Haible <bruno@clisp.org> + * readtokens.c (readtoken): Cast character to 'unsigned char', not 'unsigned int'. diff --git a/lib/same.c b/lib/same.c index b32e3dab9f..725cf61dfb 100644 --- a/lib/same.c +++ b/lib/same.c @@ -1,5 +1,5 @@ /* Determine whether two file names refer to the same file. - Copyright (C) 1997-2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1997-2000, 2002-2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -64,37 +64,43 @@ void free (); int same_name (const char *source, const char *dest) { - struct stat source_dir_stats; - struct stat dest_dir_stats; - char *source_dirname, *dest_dirname; char *source_basename, *dest_basename; size_t source_baselen, dest_baselen; - source_dirname = dir_name (source); - dest_dirname = dir_name (dest); - - if (stat (source_dirname, &source_dir_stats)) - { - /* Shouldn't happen. */ - error (1, errno, "%s", source_dirname); - } - - if (stat (dest_dirname, &dest_dir_stats)) - { - /* Shouldn't happen. */ - error (1, errno, "%s", dest_dirname); - } - - free (source_dirname); - free (dest_dirname); - - if (! SAME_INODE (source_dir_stats, dest_dir_stats)) - return 0; - + /* Compare the basenames. */ source_basename = base_name (source); dest_basename = base_name (dest); source_baselen = base_len (source_basename); dest_baselen = base_len (dest_basename); - return (source_baselen == dest_baselen - && memcmp (source_basename, dest_basename, dest_baselen) == 0); + if (source_baselen == dest_baselen + && memcmp (source_basename, dest_basename, dest_baselen) == 0) + { + struct stat source_dir_stats; + struct stat dest_dir_stats; + char *source_dirname, *dest_dirname; + + /* Compare the directories (by comparing their inodes). */ + source_dirname = dir_name (source); + dest_dirname = dir_name (dest); + + if (stat (source_dirname, &source_dir_stats)) + { + /* Shouldn't happen. */ + error (1, errno, "%s", source_dirname); + } + + if (stat (dest_dirname, &dest_dir_stats)) + { + /* Shouldn't happen. */ + error (1, errno, "%s", dest_dirname); + } + + free (source_dirname); + free (dest_dirname); + + if (SAME_INODE (source_dir_stats, dest_dir_stats)) + return 1; + } + + return 0; } |