diff options
author | Tharre <tharre3@gmail.com> | 2014-04-25 01:37:10 +0200 |
---|---|---|
committer | Tharre <tharre3@gmail.com> | 2014-04-25 02:31:01 +0200 |
commit | 93a6741801be08f363d6a63282c60a8674864565 (patch) | |
tree | d193a4e35f632ddbc88742ba7a30376b891d9790 /src | |
parent | d46b48a448deb539aaf93acc4425972e10bf5061 (diff) | |
download | redo-93a6741801be08f363d6a63282c60a8674864565.tar.gz redo-93a6741801be08f363d6a63282c60a8674864565.tar.xz redo-93a6741801be08f363d6a63282c60a8674864565.zip |
Refactor file_exists() to fexists()
Diffstat (limited to 'src')
-rw-r--r-- | src/build.c | 12 | ||||
-rw-r--r-- | src/build.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/build.c b/src/build.c index f3e8424..3bd0abd 100644 --- a/src/build.c +++ b/src/build.c @@ -29,8 +29,8 @@ int build_target(const char *target) { /* get the do-file which we are going to execute */ char *do_file = get_do_file(target); - if (do_file == NULL) { - if (file_exists(target)) { + if (!do_file) { + if (fexists(target)) { /* if our target file has no do file associated but exists, then we treat it as a source */ /* TODO: write dependencies */ @@ -152,19 +152,19 @@ char *get_do_file(const char *target) { assert(target); /* target + ".do" */ char *temp = concat(2, target, do_file_ext); - if (file_exists(temp)) + if (fexists(temp)) return temp; free(temp); /* default + get_extension(target) + ".do" */ temp = concat(3, default_name, take_extension(target), do_file_ext); - if (file_exists(temp)) + if (fexists(temp)) return temp; free(temp); /* Redofile */ temp = safe_strdup("Redofile"); - if (file_exists(temp)) + if (fexists(temp)) return temp; free(temp); @@ -184,7 +184,7 @@ char *take_extension(const char *target) { /* Checks if target exists and prints a debug message if access() failed except if it failed with ENOENT. */ -bool file_exists(const char *target) { +bool fexists(const char *target) { assert(target); if (!access(target, F_OK)) return true; diff --git a/src/build.h b/src/build.h index 418f4b0..4eda46d 100644 --- a/src/build.h +++ b/src/build.h @@ -7,7 +7,7 @@ extern char *get_do_file(const char *target); extern int build_target(const char *target); -extern bool file_exists(const char *target); +extern bool fexists(const char *target); extern char *take_extension(const char *target); extern char *remove_ext(const char *str); extern char **parsecmd(char *cmd, size_t *i, size_t keep_free); |