diff options
Diffstat (limited to 'src/lockfile.c')
| -rw-r--r-- | src/lockfile.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/src/lockfile.c b/src/lockfile.c index 72e7960..b64b30b 100644 --- a/src/lockfile.c +++ b/src/lockfile.c @@ -11,6 +11,9 @@ static char rcsid[] = /* * $Log$ + * Revision 1.15 2008/03/07 14:13:40 james + * *** empty log message *** + * * Revision 1.14 2008/03/07 13:16:02 james * *** empty log message *** * @@ -77,7 +80,7 @@ static char rcsid[] = #include "lockfile.h" -extern void *xmalloc(size_t); +extern void *xmalloc (size_t); Filelist * filelist_new (void) @@ -348,13 +351,13 @@ lockfile_make_list (char *device) ret = filelist_new (); if (ret) { - lockfile_add_name_from_dev (ret, dev_stat.st_rdev); + lockfile_add_name_from_dev (ret, dev_stat.st_rdev); - lockfile_add_name_from_path (ret, device); + lockfile_add_name_from_path (ret, device); - lockfile_check_dir_for_dev (ret, "/dev/", dev_stat.st_rdev); - lockfile_check_dir_for_dev (ret, "/dev/usb/", dev_stat.st_rdev); - lockfile_check_dir_for_dev (ret, "/dev/tts/", dev_stat.st_rdev); + lockfile_check_dir_for_dev (ret, "/dev/", dev_stat.st_rdev); + lockfile_check_dir_for_dev (ret, "/dev/usb/", dev_stat.st_rdev); + lockfile_check_dir_for_dev (ret, "/dev/tts/", dev_stat.st_rdev); } return ret; @@ -428,17 +431,17 @@ lockfile_lock (Filelist * fl) ret = filelist_new (); if (ret) { - lockfile_remove_stale (fl); - - for (fle = fl->head; fle; fle = fle->next) { - if (lockfile_make (fle->name)) { - fprintf (stderr, "Failed to get lockfile %s\n", fle->name); - filelist_free (ret); - return NULL; + lockfile_remove_stale (fl); + + for (fle = fl->head; fle; fle = fle->next) { + if (lockfile_make (fle->name)) { + fprintf (stderr, "Failed to get lockfile %s\n", fle->name); + filelist_free (ret); + return NULL; + } + filelist_add (ret, fle->name); } - filelist_add (ret, fle->name); } - } return ret; } |