[type1] Implement '-h' option. Fix exit code for known options

c/detype1/source/detype1.c

@@ -636,8 +636,9 @@ int main(int argc, char *argv[]) {
         detype1(fp1, fp2);
         fclose(fp1);
         fclose(fp2);
-    } else
+    } else {
         usage();
         return 1;
+    }
     return 0;
 }

c/type1/source/type1.c

@@ -428,8 +428,7 @@ for(;;){
  */
 
 static void usage(void) {
-	fprintf(stderr, "usage: type1 [text [font]]\n");
-	exit(1);
+	printf("usage: type1 [text [font]]\n");
 }
 
 #ifndef _MSC_VER  /* unix */
@@ -486,11 +485,16 @@ int getopt  (int argc, char **argv, char *opstring) {
 #endif /* getopt(3) definition for dos */
 
 int main(int argc, char *argv[]) {
-	int c;
-        while ((c = getopt(argc, argv, "?")) != EOF)
-                switch (c) {
-                default:        usage();
-                }
+    int c;
+    while ((c = getopt(argc, argv, "h")) != EOF)
+        switch (c) {
+            case 'h':
+                usage();
+                exit(0);
+            default:
+                usage();
+                exit(1);
+        }
         if (optind == argc){
 #if _MSC_VER
                 _setmode(_fileno(stdin),_O_BINARY);
@@ -526,7 +530,9 @@ int main(int argc, char *argv[]) {
                 type1(fp1,fp2);
 				fclose(fp1);
 				fclose(fp2);
-	} else
-		usage();
-	return 0;
+    } else {
+        usage();
+        return 1;
+    }
+    return 0;
 }

tests/runner.py

@@ -17,7 +17,7 @@
 import sys
 import tempfile
 
-__version__ = '0.5.3'
+__version__ = '0.5.4'
 
 logger = logging.getLogger('runner')
 
@@ -104,11 +104,9 @@ def _check_tool(tool_name):
     """
     if platform.system() == 'Windows':
         tool_name += '.exe'
-    # XXX start hack to bypass these issues
-    # https://github.com/adobe-type-tools/afdko/issues/347
+    # XXX start hack to bypass this issue
     # https://github.com/adobe-type-tools/afdko/issues/348
-    if tool_name.split('.')[0] in ('sfntdiff', 'sfntedit', 'makeotfexe',
-                                   'type1'):
+    if tool_name.split('.')[0] in ('sfntdiff', 'sfntedit', 'makeotfexe'):
         return tool_name
     # XXX end hack
     try:

tests/runner_test.py

@@ -20,7 +20,7 @@ def test_check_tool_error(tool_name):
     assert isinstance(_check_tool(tool_name), tuple)
 
 
-@pytest.mark.parametrize('tool_name', ['detype1'])
+@pytest.mark.parametrize('tool_name', ['detype1', 'type1'])
 def test_check_tool_unhacked(tool_name):
     expected_name = tool_name
     if platform.system() == 'Windows':

tests/type1_test.py

@@ -1,6 +1,9 @@
 from __future__ import print_function, division, absolute_import
 
 import os
+import platform
+import pytest
+import subprocess32 as subprocess
 
 from .runner import main as runner
 from .differ import main as differ
@@ -18,6 +21,24 @@ def _get_expected_path(file_name):
 # Tests
 # -----
 
+@pytest.mark.parametrize('arg', ['-h'])
+def test_exit_known_option(arg):
+    if platform.system() == 'Windows':
+        tool_name = TOOL + '.exe'
+    else:
+        tool_name = TOOL
+    assert subprocess.call([tool_name, arg]) == 0
+
+
+@pytest.mark.parametrize('arg', ['-v', '-u'])
+def test_exit_unknown_option(arg):
+    if platform.system() == 'Windows':
+        tool_name = TOOL + '.exe'
+    else:
+        tool_name = TOOL
+    assert subprocess.call([tool_name, arg]) == 1
+
+
 def test_run_on_txt_data():
     actual_path = runner(['-t', TOOL, '-f', 'type1.txt'])
     expected_path = _get_expected_path('type1.pfa')