Switch to unified view

a/src/utils/fstreewalk.cpp b/src/utils/fstreewalk.cpp
1
#ifndef lint
1
#ifndef lint
2
static char rcsid[] = "@(#$Id: fstreewalk.cpp,v 1.1 2004-12-10 18:13:13 dockes Exp $ (C) 2004 J.F.Dockes";
2
static char rcsid[] = "@(#$Id: fstreewalk.cpp,v 1.2 2004-12-12 08:58:12 dockes Exp $ (C) 2004 J.F.Dockes";
3
#endif
3
#endif
4
4
5
#ifndef TEST_FSTREEWALK
5
#ifndef TEST_FSTREEWALK
6
6
7
#include <dirent.h>
7
#include <dirent.h>
...
...
112
        if (data->options & FtwNoRecurse) {
112
        if (data->options & FtwNoRecurse) {
113
        status = fun(cdata, fn, &st, FtwDirEnter);
113
        status = fun(cdata, fn, &st, FtwDirEnter);
114
        } else {
114
        } else {
115
        status=walk(fn, fun, cdata);
115
        status=walk(fn, fun, cdata);
116
        }
116
        }
117
        if (status & (FtwStop|FtwError)) {
117
        if (status & (FtwStop|FtwError))
118
        goto out;
118
        goto out;
119
      }
119
      if ((status = fun(cdata, top, &st, FtwDirReturn)) 
120
      & (FtwStop|FtwError))
121
      goto out;
120
    } else if (S_ISREG(st.st_mode)) {
122
    } else if (S_ISREG(st.st_mode)) {
121
        if ((status = fun(cdata, fn, &st, FtwRegular)) & 
123
        if ((status = fun(cdata, fn, &st, FtwRegular)) & 
122
        (FtwStop|FtwError)) {
124
        (FtwStop|FtwError)) {
123
        goto out;
125
        goto out;
124
        }
126
        }