Merge tag 'upstream/4.14' into tizentizen_6.5.m2_releasetizen_6.0.m2_releasetizen_5.5.m2_releasesubmit/tizen_6.5/20211028.163501submit/tizen_6.0_hotfix/20201103.115102submit/tizen_6.0_hotfix/20201102.192902submit/tizen_6.0/20201029.205502submit/tizen_5.5_wearable_hotfix/20201026.184307submit/tizen_5.5_mobile_hotfix/20201026.185107submit/tizen_5.5/20191031.000007submit/tizen/20190904.070216submit/tizen/20190829.061506accepted/tizen/unified/20190904.110630accepted/tizen/6.5/unified/20211029.014057accepted/tizen/6.0/unified/hotfix/20201103.050702accepted/tizen/6.0/unified/hotfix/20201102.234932accepted/tizen/6.0/unified/20201030.110146accepted/tizen/5.5/unified/wearable/hotfix/20201027.100357accepted/tizen/5.5/unified/mobile/hotfix/20201027.074057accepted/tizen/5.5/unified/20191031.011500tizen_6.5tizen_6.0_hotfixtizen_6.0tizen_5.5_wearable_hotfixtizen_5.5_tvtizen_5.5_mobile_hotfixtizen_5.5accepted/tizen_6.5_unifiedaccepted/tizen_6.0_unified_hotfixaccepted/tizen_6.0_unifiedaccepted/tizen_5.5_unified_wearable_hotfixaccepted/tizen_5.5_unified_mobile_hotfixaccepted/tizen_5.5_unified

Change-Id: I6d4b47b2072db8e7c45daa6e269e2f0cc6f54a7f

1 files changed, 48 insertions, 8 deletions

diff --git a/src/asn1Decoding.c b/src/asn1Decoding.c
index 65456bf..b864768 100644
--- a/src/asn1Decoding.c
+++ b/src/asn1Decoding.c
@@ -25,14 +25,15 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <getopt.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <libtasn1.h>
 
-#include <progname.h>
-#include <version-etc.h>
-#include <read-file.h>
 #include "benchmark.h"
 
+#define program_name "asn1Decoding"
+
 static int decode (asn1_node definitions, const char *typeName, void *der,
 		   int der_len, int benchmark, int strict);
 
@@ -62,11 +63,51 @@ described in ASN.1 DEFINITIONS file, and print decoded structures.\n\
   -t, --no-time-strict  use strict DER decoding but not in time fields\n\
   -h, --help            display this help and exit\n\
   -v, --version         output version information and exit\n");
-      emit_bug_reporting_address ();
+     printf ("Report bugs to "PACKAGE_BUGREPORT);
     }
   exit (status);
 }
 
+static char *read_binary_file(const char *file, size_t *l)
+{
+  FILE *fp;
+  struct stat st;
+  char *out;
+
+  if (stat(file, &st) == -1)
+    {
+      fprintf(stderr, "Error reading file size!\n");
+      exit(1);
+    }
+
+  fp = fopen(file, "rb");
+  if (fp == NULL)
+    {
+      fprintf(stderr, "Error reading file!\n");
+      exit(1);
+    }
+
+  out = malloc(st.st_size+1);
+  if (out == NULL)
+    {
+      fprintf(stderr, "Memory error!\n");
+      exit(1);
+    }
+
+  *l = fread(out, 1, st.st_size, fp);
+  if (*l != st.st_size)
+    {
+      fprintf(stderr, "Error reading contents (got: %ld, expected %ld)!\n",
+              (long)*l, (long)st.st_size);
+      exit(1);
+    }
+
+  out[*l] = 0;
+
+  fclose(fp);
+  return out;
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -92,8 +133,6 @@ main (int argc, char *argv[])
   int flags = 0, debug = 0;
   /* FILE *outputFile; */
 
-  set_program_name (argv[0]);
-
   opterr = 0;			/* disable error messages from getopt */
 
   while (1)
@@ -123,8 +162,9 @@ main (int argc, char *argv[])
 	    flags |= ASN1_DECODE_FLAG_ALLOW_INCORRECT_TIME;
 	  break;
 	case 'v':		/* VERSION */
-	  version_etc (stdout, program_name, PACKAGE, VERSION,
-		       "Fabio Fiorina", NULL);
+	  printf(program_name" "PACKAGE" " VERSION"\n");
+	  printf("Copyright (C) 2017-2019 Free Software Foundation, Inc.\n\n");
+	  printf("Written by Fabio Fiorina\n");
 	  exit (0);
 	  break;
 	case '?':		/* UNKNOW OPTION */