patches/rarian-02-input-para.diff
author Jon Tibble <meths@btinternet.com>
Sat, 06 Oct 2012 16:11:50 +0100
branchs11express-2010-11
changeset 22109 db10202d5f6d
parent 13389 e2f88f2df540
permissions -rw-r--r--
Added tag oi_151a_prestable7 for changeset 25dee50cecca
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13389
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     1
diff -urN rarian-0.8.0/util/rarian-sk-migrate.cpp ../SUNWgnome-libs-2.23.6.hacked/rarian-0.8.0/util/rarian-sk-migrate.cpp
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     2
--- rarian-0.8.0/util/rarian-sk-migrate.cpp	2008-03-09 18:46:23.000000000 +0000
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     3
+++ ../SUNWgnome-libs-2.23.6.hacked/rarian-0.8.0/util/rarian-sk-migrate.cpp	2008-09-03 16:12:37.416091000 +0100
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     4
@@ -279,8 +279,14 @@
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     5
     struct stat buf;
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     6
     char *path = NULL;
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     7
 
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     8
-    if (argc != 3 || access (argv[1], R_OK)) {
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     9
+    if (argc == 3) {
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    10
+      if (access (argv[1], R_OK) < 0)
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    11
         fprintf (stderr, "ERROR: Cannot access directory %s\n", argv[1]);
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    12
+	exit (1);
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    13
+    }
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    14
+    else {
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    15
+        fprintf (stderr, "Usage: %s <Input Dir> <Program>\n", argv[0]);
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    16
+	exit (1);
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    17
     }
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    18
 	reg = rrn_reg_new_full ();
e2f88f2df540 2008-09-03 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    19