summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog2
-rw-r--r--Build/source/utils/psutils/psutils-1.21-PATCHES/ChangeLog4
-rw-r--r--Build/source/utils/psutils/psutils-1.21-PATCHES/patch-12-getopt44
-rw-r--r--Build/source/utils/psutils/psutils-1.21/psnup.12
-rw-r--r--Build/source/utils/psutils/psutils-1.21/psnup.c15
5 files changed, 52 insertions, 15 deletions
diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog
index 18b208520a4..8747ca1a3e3 100644
--- a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog
+++ b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog
@@ -1,6 +1,6 @@
2013-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
- * patch-03-getopt: Adapt paperconf.1 to non-GNU getopt.
+ * patch-03-getopt (new): Adapt paperconf.1 to non-GNU getopt.
2013-10-24 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/utils/psutils/psutils-1.21-PATCHES/ChangeLog b/Build/source/utils/psutils/psutils-1.21-PATCHES/ChangeLog
index efff6bdb7dd..804637a3dc4 100644
--- a/Build/source/utils/psutils/psutils-1.21-PATCHES/ChangeLog
+++ b/Build/source/utils/psutils/psutils-1.21-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-12-getopt (new): Adapt psnup.[1c] to non-GNU getopt.
+
2013-10-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-11-WIN32: Adapt to Visual Studio 2010 (from Akira).
diff --git a/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-12-getopt b/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-12-getopt
new file mode 100644
index 00000000000..bfe0e286b39
--- /dev/null
+++ b/Build/source/utils/psutils/psutils-1.21-PATCHES/patch-12-getopt
@@ -0,0 +1,44 @@
+diff -ur psutils-1.21.orig/psnup.1 psutils-1.21/psnup.1
+--- psutils-1.21.orig/psnup.1 2013-10-21 23:28:08.000000000 +0200
++++ psutils-1.21/psnup.1 2013-11-21 08:17:17.000000000 +0100
+@@ -32,7 +32,7 @@
+ ] [
+ .B \-s\fIscale\fR
+ ] [
+-.B \-n\fIup\fR
++.B \-\fInup\fR
+ ] [
+ .B \-q
+ ] [
+diff -ur psutils-1.21.orig/psnup.c psutils-1.21/psnup.c
+--- psutils-1.21.orig/psnup.c 2013-10-25 13:06:05.000000000 +0200
++++ psutils-1.21/psnup.c 2013-11-21 08:17:17.000000000 +0100
+@@ -64,7 +64,7 @@
+
+ while((opt =
+ getopt(argc, argv,
+- "qd::lrfcw:W:h:H:m:b:t:s:p:P:n:1::2::3::4::5::6::7::8::9::"))
++ "qd::lrfcw:W:h:H:m:b:t:s:p:P:n:123456789"))
+ != EOF) {
+ switch(opt) {
+ case 'q': /* quiet */
+@@ -141,18 +141,7 @@
+ case '7':
+ case '8':
+ case '9':
+- if(optarg) {
+- char *valuestr = (char *) malloc(strlen(optarg) + 2);
+- valuestr[0] = opt;
+- strcpy(&(valuestr[1]), optarg);
+-
+- /* really should check that valuestr is only digits here...*/
+- if ((nup = atoi(valuestr)) < 1)
+- message(FATAL, "-n %d too small\n", nup);
+- free(valuestr);
+- } else {
+- nup = (opt - '0');
+- }
++ nup = (opt - '0');
+ break;
+ case 'v': /* version */
+ default:
diff --git a/Build/source/utils/psutils/psutils-1.21/psnup.1 b/Build/source/utils/psutils/psutils-1.21/psnup.1
index 200b4eb6406..80fb98e7543 100644
--- a/Build/source/utils/psutils/psutils-1.21/psnup.1
+++ b/Build/source/utils/psutils/psutils-1.21/psnup.1
@@ -32,7 +32,7 @@ psnup \- multiple pages per sheet
] [
.B \-s\fIscale\fR
] [
-.B \-n\fIup\fR
+.B \-\fInup\fR
] [
.B \-q
] [
diff --git a/Build/source/utils/psutils/psutils-1.21/psnup.c b/Build/source/utils/psutils/psutils-1.21/psnup.c
index cfbe5f6968a..f796c341174 100644
--- a/Build/source/utils/psutils/psutils-1.21/psnup.c
+++ b/Build/source/utils/psutils/psutils-1.21/psnup.c
@@ -64,7 +64,7 @@ main(int argc, char *argv[])
while((opt =
getopt(argc, argv,
- "qd::lrfcw:W:h:H:m:b:t:s:p:P:n:1::2::3::4::5::6::7::8::9::"))
+ "qd::lrfcw:W:h:H:m:b:t:s:p:P:n:123456789"))
!= EOF) {
switch(opt) {
case 'q': /* quiet */
@@ -141,18 +141,7 @@ main(int argc, char *argv[])
case '7':
case '8':
case '9':
- if(optarg) {
- char *valuestr = (char *) malloc(strlen(optarg) + 2);
- valuestr[0] = opt;
- strcpy(&(valuestr[1]), optarg);
-
- /* really should check that valuestr is only digits here...*/
- if ((nup = atoi(valuestr)) < 1)
- message(FATAL, "-n %d too small\n", nup);
- free(valuestr);
- } else {
- nup = (opt - '0');
- }
+ nup = (opt - '0');
break;
case 'v': /* version */
default: