Enhanced machine type

[netatalk.git] / bin / cnid / ad_ls.c

diff --git a/bin/cnid/ad_ls.c b/bin/cnid/ad_ls.c
index ab1385a6a367d5bf03bf60b903c039ebe30c46c4..cd6545e15c49c9412b179fb3ba3a725605c974ed 100644 (file)
--- a/bin/cnid/ad_ls.c
+++ b/bin/cnid/ad_ls.c
@@ -1,5 +1,5 @@
 /* 
-   $Id: ad_ls.c,v 1.2 2009-09-14 01:24:40 didg Exp $
+   $Id: ad_ls.c,v 1.4 2009-10-14 01:38:28 didg Exp $
 
    Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
    
@@ -88,7 +88,7 @@ static const char *check_netatalk_dirs(const char *name)
 }
 
 
-static void usage_ls()
+static void usage_ls(void)
 {
     printf(
         "Usage: ad ls [-dRl[u]] [file|dir, ...]\n\n"
@@ -407,7 +407,7 @@ static void print_mode(const struct stat *st)
 #undef TYPE
 #undef MODE
 
-int ad_print(char *path, const struct stat *st, afpvol_t *vol)
+static int ad_print(char *path, const struct stat *st, afpvol_t *vol)
 {
     if ( ! ls_l) {
         printf("%s  ", path);
@@ -432,7 +432,7 @@ int ad_print(char *path, const struct stat *st, afpvol_t *vol)
     return 0;
 }
 
-int ad_ls_r(char *path, afpvol_t *vol)
+static int ad_ls_r(char *path, afpvol_t *vol)
 {
     int ret = 0, cwd, dirprinted = 0, dirempty;
     const char *name;
@@ -520,9 +520,9 @@ int ad_ls_r(char *path, afpvol_t *vol)
             if ((name = check_netatalk_dirs(ep->d_name)) != NULL)
                 continue;
 
-            if (lstat(ep->d_name, &st) < 0) {
+            if ((ret = lstat(ep->d_name, &st)) < 0) {
                 perror("Can't stat");
-                return -1;
+                goto exit;
             }
 
             /* Recursion */