1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
diff -urN fbutils-20041102-1/Rules.config fbutils-20041102-1-ptx/Rules.config
--- fbutils-20041102-1/Rules.config 2001-08-06 19:28:23.000000000 +0200
+++ fbutils-20041102-1-ptx/Rules.config 2004-11-02 10:49:23.000000000 +0100
@@ -1,5 +1,5 @@
-CXX = g++
+CXX ?= g++
OPTFLAGS = -O2
DEBUGFLAGS =
CFLAGS = -Wall -I../include $(OPTFLAGS) $(DEBUGFLAGS)
@@ -9,5 +9,5 @@
INSTALL = install
RM = rm -f
LN = ln -sf
-AR = ar
+AR ?= ar
diff -urN fbutils-20041102-1/fbcmap/fbcmap.C fbutils-20041102-1-ptx/fbcmap/fbcmap.C
--- fbutils-20041102-1/fbcmap/fbcmap.C 2001-08-06 19:28:23.000000000 +0200
+++ fbutils-20041102-1-ptx/fbcmap/fbcmap.C 2004-11-02 13:58:24.000000000 +0100
@@ -30,6 +30,7 @@
{ 0, 0, "debug", &Opt_debug, 0 },
{ 0, 'f', "frame-buffer", &Opt_fb, 1 },
{ 0, 'l', "length", &Opt_length, 1 },
+ { 0, 'c', "command", &Opt_command, 1 },
};
u_int DebugMask = 0;
@@ -61,11 +62,12 @@
" -v, --verbose : Verbose mode\n"
" -l, --length len : Colormap length\n"
" -f, --frame-buffer dev : Framebuffer device to use\n"
- " -d, --dump : Dump the colormap (default operation)\n"
- " -r, --ramp : Set the colormap to a ramp\n"
- " -c, --vga : Set the colormap to the VGA console "
+ " -c <CMD> : execute command, where command is one of\n"
+ " vga : Set the colormap to the VGA console "
"palette\n"
- " -i, --inverse : Invert the current colormap\n"
+ " inverse : Invert the current colormap\n"
+ " ramp : Set the colormap to a ramp\n"
+ " dump : dump current palette (default)\n"
"\n", ProgramName);
}
diff -urN fbutils-20041102-1/include/util.h fbutils-20041102-1-ptx/include/util.h
--- fbutils-20041102-1/include/util.h 2001-08-06 19:28:23.000000000 +0200
+++ fbutils-20041102-1-ptx/include/util.h 2004-11-02 10:39:36.000000000 +0100
@@ -20,7 +20,7 @@
extern void Die(const char *fmt,...) __attribute__((noreturn));
extern void Warn(const char *fmt,...);
-extern int GetNextOption(int &argc, const char **&argv,
+extern int GetNextOption(int argc, char **argv,
const struct option options[],
const u_int num_options);
diff -urN fbutils-20041102-1/lib/framebuffer.C fbutils-20041102-1-ptx/lib/framebuffer.C
--- fbutils-20041102-1/lib/framebuffer.C 2001-08-06 19:28:23.000000000 +0200
+++ fbutils-20041102-1-ptx/lib/framebuffer.C 2004-11-02 10:21:33.000000000 +0100
@@ -164,7 +164,7 @@
}
}
-void ColorMap::Print(const char *indent = "") const
+void ColorMap::Print(const char *indent) const
{
printf("start = %d\n", start);
printf("len = %d\n", len);
@@ -191,7 +191,7 @@
Die("ioctl FBIOPUT_CON2FBMAP: %s\n", strerror(errno));
}
-void Con2FBMap::Print(const char *indent = "") const
+void Con2FBMap::Print(const char *indent) const
{
printf("%sconsole %d -> fb %d\n", indent, console, framebuffer);
}
diff -urN fbutils-20041102-1/lib/list.C fbutils-20041102-1-ptx/lib/list.C
--- fbutils-20041102-1/lib/list.C 2001-08-06 19:28:23.000000000 +0200
+++ fbutils-20041102-1-ptx/lib/list.C 2004-11-02 10:14:03.000000000 +0100
@@ -1,4 +1,4 @@
-
+#include <string.h>
#include "list.h"
#include "util.h"
diff -urN fbutils-20041102-1/lib/util.C fbutils-20041102-1-ptx/lib/util.C
--- fbutils-20041102-1/lib/util.C 2001-08-06 19:28:23.000000000 +0200
+++ fbutils-20041102-1-ptx/lib/util.C 2004-11-02 10:44:29.000000000 +0100
@@ -6,6 +6,7 @@
#include <string.h>
#include <unistd.h>
#include <sys/ioctl.h>
+#include <stdlib.h>
#include "util.h"
@@ -43,7 +44,7 @@
// Command Line Parameter Processing
-int GetNextOption(int &argc, const char **&argv,
+int GetNextOption(int argc, char **argv,
const struct option options[], const u_int num_options)
{
static bool first = true;
|
