On Tue, Jan 28, 2014 at 10:50 AM, Silvan Jegen <[email protected]> wrote:
> Signed-off-by: Silvan Jegen <[email protected]> > --- > src/pacman/util.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/src/pacman/util.c b/src/pacman/util.c > index 58b0cec..4aaa98f 100644 > --- a/src/pacman/util.c > +++ b/src/pacman/util.c > @@ -206,12 +206,10 @@ int rmrf(const char *path) > return 1; > } > for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { > - if(dp->d_name) { > - if(strcmp(dp->d_name, "..") != 0 && > strcmp(dp->d_name, ".") != 0) { > - char name[PATH_MAX]; > - snprintf(name, PATH_MAX, "%s/%s", > path, dp->d_name); > - errflag += rmrf(name); > - } > + if(strcmp(dp->d_name, "..") != 0 && > strcmp(dp->d_name, ".") != 0) { > + char name[PATH_MAX]; > + snprintf(name, PATH_MAX, "%s/%s", path, > dp->d_name); > + errflag += rmrf(name); > I'm failing to see how this one is valid. Please explain? I'm not sure the original code is right (we should likely be checking that d_name[0] is != '\0;), but removing the check completely seems heavy-handed. > } > } > closedir(dirp); > -- > 1.8.5.3 > > >
