[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 91f3b4a55ce6dbd6df4c839e993c240589f2377d
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed Feb 14 12:52:27 2007 +1100

    Fix for getopt_long and unknown arguments
    
    darcs-hash:20070214015227-d4795-27e07e3074ca9aaa81bca1a8715fc0d28cf2caca.gz

diff --git a/src/gerris.c b/src/gerris.c
index 273bb1d..40d5dfd 100644
--- a/src/gerris.c
+++ b/src/gerris.c
@@ -60,7 +60,8 @@ int main (int argc, char * argv[])
       {"partition", required_argument, NULL, 'p'},
       {"profile", no_argument, NULL, 'P'},
       {"help", no_argument, NULL, 'h'},
-      {"version", no_argument, NULL, 'V'}
+      {"version", no_argument, NULL, 'V'},
+      { NULL }
     };
     int option_index = 0;
     switch ((c = getopt_long (argc, argv, "hVs:p:P",
diff --git a/tools/gfs2oogl.c b/tools/gfs2oogl.c
index 0d90bb4..3df2695 100644
--- a/tools/gfs2oogl.c
+++ b/tools/gfs2oogl.c
@@ -755,6 +755,7 @@ int main (int argc, char * argv[])
       {"vector", required_argument, NULL, 'V'},
       {"help", no_argument, NULL, 'h'},
       {"verbose", no_argument, NULL, 'v'},
+      { NULL }
     };
     int option_index = 0;
     switch ((c = getopt_long (argc, argv, 
diff --git a/tools/gfscompare.c b/tools/gfscompare.c
index dc724f7..d9a2dc8 100644
--- a/tools/gfscompare.c
+++ b/tools/gfscompare.c
@@ -364,7 +364,8 @@ int main (int argc, char * argv[])
       {"centered", no_argument, NULL, 'c'},
       {"not-weighted", no_argument, NULL, 'w'},
       {"constant", no_argument, NULL, 'C'},
-      {"extensive", no_argument, NULL, 'e'}
+      {"extensive", no_argument, NULL, 'e'},
+      { NULL }
     };
     int option_index = 0;
     switch ((c = getopt_long (argc, argv, "hvnog:f:lSrHp:cwCeaGm:M:xt",
diff --git a/tools/ppmcombine.c b/tools/ppmcombine.c
index 89ef52f..ee97343 100644
--- a/tools/ppmcombine.c
+++ b/tools/ppmcombine.c
@@ -41,6 +41,7 @@ int main (int argc, char * argv[])
     static struct option long_options[] = {
       {"help", no_argument, NULL, 'h'},
       {"verbose", no_argument, NULL, 'v'},
+      { NULL }
     };
     int option_index = 0;
     switch ((c = getopt_long (argc, argv, "hv",
diff --git a/tools/shapes.c b/tools/shapes.c
index 09e3511..d8f725e 100644
--- a/tools/shapes.c
+++ b/tools/shapes.c
@@ -440,7 +440,8 @@ int main (int argc, char * argv[])
       {"dr", required_argument, NULL, 'd'},
       {"ratio", required_argument, NULL, 'r'},
       {"help", no_argument, NULL, 'h'},
-      {"verbose", no_argument, NULL, 'v'}
+      {"verbose", no_argument, NULL, 'v'},
+      { NULL }
     };
     int option_index = 0;
     switch ((c = getopt_long (argc, argv, "hvn:d:r:oz",
diff --git a/tools/streamanime.c b/tools/streamanime.c
index 2ca27cd..dc5ecae 100644
--- a/tools/streamanime.c
+++ b/tools/streamanime.c
@@ -62,6 +62,7 @@ int main (int argc, char * argv[])
     static struct option long_options[] = {
       {"help", no_argument, NULL, 'h'},
       {"verbose", no_argument, NULL, 'v'},
+      { NULL }
     };
     int option_index = 0;
     switch ((c = getopt_long (argc, argv, "hv",

-- 
Gerris Flow Solver