Fix DV memory leak and allow multiple instances patch by (Burkhard Plaum?)

[ffmpeg.git] / cmdutils.c

diff --git a/cmdutils.c b/cmdutils.c
index e47807e..3b35cf4 100644 (file)
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #define HAVE_AV_CONFIG_H
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #define HAVE_AV_CONFIG_H

-#include "common.h"

 #include "avformat.h"
 #include "avformat.h"

+#include "common.h"

 
 #include "cmdutils.h"
 
 
 #include "cmdutils.h"
 


@@ -35,16 +35,25 @@ void show_help_options(const OptionDef *options, const char *msg, int mask, int
                 printf("%s", msg);
                 first = 0;
             }
                 printf("%s", msg);
                 first = 0;
             }

-            strcpy(buf, po->name);
+            pstrcpy(buf, sizeof(buf), po->name);

             if (po->flags & HAS_ARG) {
             if (po->flags & HAS_ARG) {

-                strcat(buf, " ");
-                strcat(buf, po->argname);
+                pstrcat(buf, sizeof(buf), " ");
+                pstrcat(buf, sizeof(buf), po->argname);

             }
             printf("-%-17s  %s\n", buf, po->help);
         }
     }
 }
 
             }
             printf("-%-17s  %s\n", buf, po->help);
         }
     }
 }
 

+static const OptionDef* find_option(const OptionDef *po, const char *name){
+    while (po->name != NULL) {
+        if (!strcmp(name, po->name))
+            break;
+        po++;
+    }
+    return po;
+}
+

 void parse_options(int argc, char **argv, const OptionDef *options)
 {
     const char *opt, *arg;
 void parse_options(int argc, char **argv, const OptionDef *options)
 {
     const char *opt, *arg;


@@ -55,15 +64,13 @@ void parse_options(int argc, char **argv, const OptionDef *options)
     optindex = 1;
     while (optindex < argc) {
         opt = argv[optindex++];
     optindex = 1;
     while (optindex < argc) {
         opt = argv[optindex++];

-        
+

         if (opt[0] == '-' && opt[1] != '\0') {
         if (opt[0] == '-' && opt[1] != '\0') {

-            po = options;
-            while (po->name != NULL) {
-                if (!strcmp(opt + 1, po->name))
-                    break;
-                po++;
-            }
+            po= find_option(options, opt + 1);
+            if (!po->name)
+                po= find_option(options, "default");

             if (!po->name) {
             if (!po->name) {

+unknown_opt:

                 fprintf(stderr, "%s: unrecognized option '%s'\n", argv[0], opt);
                 exit(1);
             }
                 fprintf(stderr, "%s: unrecognized option '%s'\n", argv[0], opt);
                 exit(1);
             }


@@ -81,8 +88,15 @@ void parse_options(int argc, char **argv, const OptionDef *options)
                 *po->u.str_arg = str;
             } else if (po->flags & OPT_BOOL) {
                 *po->u.int_arg = 1;
                 *po->u.str_arg = str;
             } else if (po->flags & OPT_BOOL) {
                 *po->u.int_arg = 1;

+            } else if (po->flags & OPT_INT) {
+                *po->u.int_arg = atoi(arg);
+            } else if (po->flags & OPT_FLOAT) {
+                *po->u.float_arg = atof(arg);
+            } else if (po->flags & OPT_FUNC2) {
+                if(po->u.func2_arg(opt+1, arg)<0)
+                    goto unknown_opt;

             } else {
             } else {

-               po->u.func_arg(arg);
+                po->u.func_arg(arg);

             }
         } else {
             parse_arg_file(opt);
             }
         } else {
             parse_arg_file(opt);


@@ -97,7 +111,7 @@ void print_error(const char *filename, int err)
         fprintf(stderr, "%s: Incorrect image filename syntax.\n"
                 "Use '%%d' to specify the image number:\n"
                 "  for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
         fprintf(stderr, "%s: Incorrect image filename syntax.\n"
                 "Use '%%d' to specify the image number:\n"
                 "  for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"

-                "  for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n", 
+                "  for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n",

                 filename);
         break;
     case AVERROR_INVALIDDATA:
                 filename);
         break;
     case AVERROR_INVALIDDATA:


@@ -106,6 +120,14 @@ void print_error(const char *filename, int err)
     case AVERROR_NOFMT:
         fprintf(stderr, "%s: Unknown format\n", filename);
         break;
     case AVERROR_NOFMT:
         fprintf(stderr, "%s: Unknown format\n", filename);
         break;

+    case AVERROR_IO:
+        fprintf(stderr, "%s: I/O error occured\n"
+                "Usually that means that input file is truncated and/or corrupted.\n",
+                filename);
+        break;
+    case AVERROR_NOMEM:
+        fprintf(stderr, "%s: memory allocation error occured\n", filename);
+        break;

     default:
         fprintf(stderr, "%s: Error while opening file\n", filename);
         break;
     default:
         fprintf(stderr, "%s: Error while opening file\n", filename);
         break;