Imported from /home/lorry/working-area/delta_subversion-tarball/subversion-1.8.13.tar.gz.subversion-1.8.13

1 files changed, 7 insertions, 2 deletions

diff --git a/tools/diff/diff.c b/tools/diff/diff.c
index d681381..c4b5e9d 100644
--- a/tools/diff/diff.c
+++ b/tools/diff/diff.c
@@ -89,6 +89,8 @@ int main(int argc, const char *argv[])
 
   options_array = apr_array_make(pool, 0, sizeof(const char *));
 
+  diff_options = svn_diff_file_options_create(pool);
+
   for (i = 1 ; i < argc ; i++)
     {
       if (!no_more_options && (argv[i][0] == '-'))
@@ -105,6 +107,11 @@ int main(int argc, const char *argv[])
               show_c_function = TRUE;
               continue;
             }
+          if (argv[i][1] == 'w' && !argv[i][2])
+            {
+              diff_options->ignore_space = svn_diff_file_ignore_space_all;
+              continue;
+            }
           APR_ARRAY_PUSH(options_array, const char *) = argv[i];
         }
       else
@@ -127,8 +134,6 @@ int main(int argc, const char *argv[])
       return 2;
     }
 
-  diff_options = svn_diff_file_options_create(pool);
-
   svn_err = svn_diff_file_options_parse(diff_options, options_array, pool);
   if (svn_err)
     {