Merging upstream version 1.2~pre2.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 2 insertions, 2 deletions

diff --git a/main.cc b/main.cc
index e6d2d18..04956b6 100644
--- a/main.cc
+++ b/main.cc
@@ -275,7 +275,7 @@ int main( const int argc, const char * const argv[] )
   for( ; argind < parser.arguments(); ++argind )
     {
     const int code = parser.code( argind );
-    const char * arg = parser.argument( argind ).c_str();
+    const char * const arg = parser.argument( argind ).c_str();
     if( !code )
       {
       if( program_mode == m_zgrep && !grep_pattern_found )
@@ -399,7 +399,7 @@ int main( const int argc, const char * const argv[] )
       if( recursive )
         {
         struct stat st;
-        if( !stat( input_filename.c_str(), &st ) && S_ISDIR( st.st_mode ) )
+        if( stat( input_filename.c_str(), &st ) == 0 && S_ISDIR( st.st_mode ) )
           {
           DIR * const dirp = opendir( input_filename.c_str() );
           if( !dirp )