Option to read images from a Folder whose path is specified in the Input parameters by "-ImgDir" along with output decod format specified by "-OutFor" . Modifications in image_to_j2k.c, j2k_to_image.c, getopt.c, getopt.h

Enabling use of multi character input parameters in the codec. Modifications in image_to_j2k.c, j2k_to_image.c, getopt.c, getopt.h

2 files changed, 148 insertions, 0 deletions

diff --git a/codec/compat/getopt.c b/codec/compat/getopt.c
index ffc921bd..426095b5 100644
--- a/codec/compat/getopt.c
+++ b/codec/compat/getopt.c
@@ -47,10 +47,36 @@ int opterr = 1,			/* if error message should be printed */
  optreset;			/* reset getopt */
 const char *optarg;			/* argument associated with option */
 
+typedef struct option
+{
+	char *name;
+	int has_arg;
+	int *flag;
+	int val;
+}option_t;
+
 #define	BADCH	(int)'?'
 #define	BADARG	(int)':'
 #define	EMSG	""
 
+
+
+static void getopterror(int which) {
+	static char error1[]="Unknown option `-x'.\n";
+	static char error2[]="Missing argument for `-x'.\n";
+	if (opterr) {
+		if (which) {
+			error2[23]=optopt;
+			fprintf(stderr,"%s\n",error2);
+			
+		} else {
+			error1[17]=optopt;
+			fprintf(stderr,"%s\n",error1);
+		}
+	}
+}
+
+
 /*
  * getopt --
  *	Parse argc/argv argument vector.
@@ -110,3 +136,110 @@ int getopt(int nargc, char *const *nargv, const char *ostr) {
   }
   return (optopt);		/* dump back option letter */
 }
+
+
+int getopt_long(int argc, char * const argv[], const char *optstring,
+struct option *longopts, int *longindex, int totlen) {
+	static int lastidx,lastofs;
+	char *tmp;
+	int i,len;
+again:
+	if (optind>argc || !argv[optind] || *argv[optind]!='-' || argv[optind][1]==0)
+		return -1;
+
+	if (argv[optind][0]=='-' && argv[optind][1]==0) {
+		++optind;
+		return -1;
+	}
+
+	if (argv[optind][0]=='-') {	/* long option */
+		char* arg=argv[optind]+1;
+		char* max=strchr(arg,'=');
+		const struct option* o;
+		if (!max) max=arg+strlen(arg);
+		o=longopts;
+		len=sizeof(longopts[0]);
+
+		for (i=0;i<totlen;i=i+len,o++) {
+			if (!strncmp(o->name,arg,(size_t)(max-arg))) {	/* match */
+				if (longindex) *longindex=o-longopts;
+				if (o->has_arg>0) {
+					if (*max=='=')
+						optarg=max+1;
+					else {
+						optarg=argv[optind+1];
+						if(optarg){
+							if (strchr(optarg,'-')){ /* No argument */
+								if (*optstring==':') return ':';
+								if (opterr)
+								(void) fprintf(stderr,"%s: option requires an argument %c\n",arg, optopt);
+								return (BADCH);
+								++optind;
+							}
+						}
+						if (!optarg && o->has_arg==1) {	/* no argument there */
+							if (*optstring==':') return ':';
+							if (opterr)
+							(void) fprintf(stderr,"%s: option requires an argument %c\n",arg, optopt);
+							return (BADCH);
+							++optind;
+						}
+						++optind;
+					}
+				}
+				++optind;
+				if (o->flag)
+					*(o->flag)=o->val;
+				else
+					return o->val;
+				return 0;
+			}
+		}//(end for)
+
+		if (*optstring==':') return ':';
+
+		if (lastidx!=optind) {
+			lastidx=optind; lastofs=0;
+		}
+		optopt=argv[optind][lastofs+1];
+
+		if ((tmp=strchr(optstring,optopt))) {
+			if (*tmp==0) {	/* apparently, we looked for \0, i.e. end of argument */
+				++optind;
+				goto again;
+			}
+
+			if (tmp[1]==':') {	/* argument expected */
+				if (tmp[2]==':' || argv[optind][lastofs+2]) {	/* "-foo", return "oo" as optarg */
+					if (!*(optarg=argv[optind]+lastofs+2)) optarg=0;
+					goto found;
+				}
+
+				optarg=argv[optind+1];
+				if (!optarg) {	/* missing argument */
+					++optind;
+					if (*optstring==':') return ':';
+					getopterror(1);
+					return ':';
+				}
+				++optind;
+			}
+			else {
+				++lastofs;
+				return optopt;
+			}
+found:
+			++optind;
+			return optopt;
+		} 
+		else {	/* not found */
+			getopterror(0);
+			++optind;
+			return '?';
+		}
+		
+		fprintf(stderr,"Invalid option %s\n",arg);
+		++optind;
+		return '?';
+	}// end of long option
+}
diff --git a/codec/compat/getopt.h b/codec/compat/getopt.h
index ab9c1a7b..4492e850 100644
--- a/codec/compat/getopt.h
+++ b/codec/compat/getopt.h
@@ -3,6 +3,18 @@
 #ifndef _GETOPT_H_
 #define _GETOPT_H_
 
+typedef struct option
+{
+	char *name;
+	int has_arg;
+	int *flag;
+	int val;
+}option_t;
+
+#define	NO_ARG	0
+#define REQ_ARG	1
+#define OPT_ARG	2
+
 extern int opterr;
 extern int optind;
 extern int optopt;
@@ -10,5 +22,8 @@ extern int optreset;
 extern char *optarg;
 
 extern int getopt(int nargc, char *const *nargv, const char *ostr);
+extern int getopt_long(int argc, char * const argv[], const char *optstring,
+			const struct option *longopts, int *longindex,int totlen);
+
 
 #endif				/* _GETOPT_H_ */