bug 1294417 - Make certdata.perl take input/output as command-line pa…

…rameters. r=wtc
sailfishos-mirror · Aug 16, 2016 · 3194bb6 · 3194bb6
1 parent 4365cb2
commit 3194bb6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/ckfw/builtins/Makefile b/lib/ckfw/builtins/Makefile
@@ -51,4 +51,4 @@ endif
 
 $(OBJDIR)/certdata.c: $(NSS_CERTDATA_TXT) certdata.perl
 	@$(MAKE_OBJDIR)
-	$(PERL) certdata.perl < $(NSS_CERTDATA_TXT) > $@
+	$(PERL) certdata.perl $(NSS_CERTDATA_TXT) $@
diff --git a/lib/ckfw/builtins/certdata.perl b/lib/ckfw/builtins/certdata.perl
@@ -14,6 +14,18 @@
 $constants{CK_TRUE} = "static const CK_BBOOL ck_true = CK_TRUE;\n";
 $constants{CK_FALSE} = "static const CK_BBOOL ck_false = CK_FALSE;\n";
 
+if( scalar @ARGV == 0 ) {
+  print STDERR "Usage: $0 <input-file> [output-file]\n";
+  exit 1;
+}
+
+open(STDIN, '<', $ARGV[0])
+  or die "Could not open input file '$ARGV[0]' $!";
+if( scalar @ARGV > 1 ) {
+  open(STDOUT, '>', $ARGV[1])
+    or die "Could not open output file '$ARGV[1]' $!";
+}
+
 while(<>) {
   my @fields = ();
   my $size;