Now it compiles. Haven't tried anyting real though yet. Compilation log
and a patch with all the changes to brltty attached.
Note: gettimeofday_fake uses slow 64-bit division. Using
grub_get_time_ms directly would be preferable.
--
Regards
Vladimir 'φ-coder/phcoder' Serbinenko
diff -ur /home/phcoder/repos/brltty/Programs/async.c grub-core/braille/brltty/Programs/async.c
--- /home/phcoder/repos/brltty/Programs/async.c 2012-03-22 17:40:51.067380000 +0100
+++ grub-core/braille/brltty/Programs/async.c 2012-03-23 22:57:43.108843011 +0100
@@ -841,7 +841,7 @@
void *data
) {
struct timeval time;
- gettimeofday(&time, NULL);
+ gettimeofday_fake(&time, NULL);
adjustTime(&time, interval);
return asyncAbsoluteAlarm(&time, callback, data);
}
@@ -850,7 +850,7 @@
asyncWait (int duration) {
long int elapsed = 0;
struct timeval start;
- gettimeofday(&start, NULL);
+ gettimeofday_fake(&start, NULL);
do {
long int timeout = duration;
diff -ur /home/phcoder/repos/brltty/Programs/auth.c grub-core/braille/brltty/Programs/auth.c
--- /home/phcoder/repos/brltty/Programs/auth.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/auth.c 2012-03-23 21:28:59.588721542 +0100
@@ -25,7 +25,10 @@
#if defined(__MINGW32__)
#include <ws2tcpip.h>
-#elif defined(__MSDOS__)
+#elif !defined (HAVE_USERS)
+
+#define uid_t int
+#define gid_t int
#else /* Unix */
#include <sys/socket.h>
@@ -629,7 +632,7 @@
void
formatAddress (char *buffer, int bufferSize, const void *address, int addressSize) {
-#ifdef __MSDOS__
+#if !defined (HAVE_USERS)
snprintf(buffer, bufferSize, "unknown");
#else /* __MSDOS__ */
const struct sockaddr *sa = address;
Only in /home/phcoder/repos/brltty/Programs: auth.o
diff -ur /home/phcoder/repos/brltty/Programs/beeper.c grub-core/braille/brltty/Programs/beeper.c
--- /home/phcoder/repos/brltty/Programs/beeper.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/beeper.c 2012-03-23 21:28:59.588721542 +0100
@@ -55,6 +55,7 @@
return 1;
}
+#ifndef HAVE_FLOAT
if (asynchronousBeep((int)noteFrequencies[note], duration*4)) {
accurateDelay(duration);
stopBeep();
@@ -68,6 +69,7 @@
}
return synchronousBeep((int)noteFrequencies[note], duration);
+#endif
}
static int
diff -ur /home/phcoder/repos/brltty/Programs/brltty.c grub-core/braille/brltty/Programs/brltty.c
--- /home/phcoder/repos/brltty/Programs/brltty.c 2012-03-22 17:40:51.067380000 +0100
+++ grub-core/braille/brltty/Programs/brltty.c 2012-03-23 23:16:17.780868445 +0100
@@ -92,6 +92,9 @@
unsigned int updateIntervals = 0;
unsigned char infoMode = 0;
+#define atexit(x)
+#define exit(x)
+
static void
setSessionEntry (void) {
describeScreen(&scr);
@@ -136,6 +139,7 @@
closeLogFile();
}
+#ifdef HAVE_SIGNALS
static void
handleSignal (int number, void (*handler) (int)) {
#ifdef HAVE_SIGACTION
@@ -152,6 +156,7 @@
}
#endif /* HAVE_SIGACTION */
}
+#endif
void
testProgramTermination (void) {
@@ -1163,7 +1168,8 @@
#endif /* SIGINT */
/* Setup everything required on startup */
- startup(argc, argv);
+ if (startup(argc, argv))
+ return 1;
atexit(exitSessions);
brlttyPrepare = brlttyPrepare_first;
@@ -2065,7 +2071,7 @@
int column, row;
if (getCharacterCoordinates(arg, &column, &row, 0, 0)) {
- static char *colours[] = {
+ static const char *colours[] = {
strtext("black"),
strtext("blue"),
strtext("green"),
diff -ur /home/phcoder/repos/brltty/Programs/brltty.h grub-core/braille/brltty/Programs/brltty.h
--- /home/phcoder/repos/brltty/Programs/brltty.h 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/brltty.h 2012-03-23 23:11:11.960861470 +0100
@@ -61,7 +61,7 @@
extern ContractionTable *contractionTable;
extern void testProgramTermination (void);
-extern void startup (int argc, char *argv[]);
+extern int startup (int argc, char *argv[]);
extern void setPreferences (const Preferences *newPreferences);
extern int loadPreferences (void);
diff -ur /home/phcoder/repos/brltty/Programs/cmd.c grub-core/braille/brltty/Programs/cmd.c
--- /home/phcoder/repos/brltty/Programs/cmd.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/cmd.c 2012-03-23 22:59:49.344845893 +0100
@@ -431,7 +431,7 @@
if (*command == EOF) {
if (state->timeout) {
struct timeval now;
- gettimeofday(&now, NULL);
+ gettimeofday_fake(&now, NULL);
if (millisecondsBetween(&state->time, &now) >= state->timeout) {
*command = state->command;
state->time = now;
@@ -493,7 +493,7 @@
state->command = *command;
if (flags & BRL_FLG_REPEAT_DELAY) {
- gettimeofday(&state->time, NULL);
+ gettimeofday_fake(&state->time, NULL);
state->timeout = delay;
if (flags & BRL_FLG_REPEAT_INITIAL) {
state->started = 1;
@@ -501,7 +501,7 @@
*command = BRL_CMD_NOOP;
}
} else if (flags & BRL_FLG_REPEAT_INITIAL) {
- gettimeofday(&state->time, NULL);
+ gettimeofday_fake(&state->time, NULL);
state->timeout = interval;
state->started = 1;
} else {
Only in /home/phcoder/repos/brltty/Programs: cmd.o
diff -ur /home/phcoder/repos/brltty/Programs/cmds.auto.h grub-core/braille/brltty/Programs/cmds.auto.h
--- /home/phcoder/repos/brltty/Programs/cmds.auto.h 2010-11-19 06:05:00.690134950 +0100
+++ grub-core/braille/brltty/Programs/cmds.auto.h 2012-03-23 21:28:59.592721546 +0100
@@ -517,6 +517,7 @@
.description = "bring cursor to character"
}
,
+#if 0
{
.name = "CUTBEGIN",
.code = BRL_BLK_CUTBEGIN,
@@ -545,6 +546,7 @@
.description = "linear cut to character"
}
,
+#endif
{
.name = "SWITCHVT",
.code = BRL_BLK_SWITCHVT,
@@ -621,6 +623,7 @@
.description = "go down to nearest line with different character"
}
,
+#if 0
{
.name = "COPYCHARS",
.code = BRL_BLK_COPYCHARS,
@@ -635,6 +638,7 @@
.description = "append characters to cut buffer"
}
,
+#endif
{
.name = "PASSKEY",
.code = BRL_BLK_PASSKEY,
diff -ur /home/phcoder/repos/brltty/Programs/config.c grub-core/braille/brltty/Programs/config.c
--- /home/phcoder/repos/brltty/Programs/config.c 2012-03-23 19:02:56.804328000 +0100
+++ grub-core/braille/brltty/Programs/config.c 2012-03-23 23:16:31.872868768 +0100
@@ -66,6 +66,9 @@
#include "io_usb.h"
#include "io_bluetooth.h"
+#define atexit(x)
+#define exit(x)
+
#ifdef __MINGW32__
#include "sys_windows.h"
@@ -124,9 +127,9 @@
static char *oldPreferencesFile = NULL;
static int oldPreferencesEnabled = 1;
-static char *opt_tablesDirectory;
-static char *opt_textTable;
-static char *opt_attributesTable;
+static const char *opt_tablesDirectory;
+static const char *opt_textTable;
+static const char *opt_attributesTable;
#ifdef ENABLE_CONTRACTED_BRAILLE
static char *opt_contractionTable;
@@ -871,10 +874,11 @@
char *path = makePreferencesFilePath(opt_preferencesFile);
if (path) {
- if (testPath(path)) {
- oldPreferencesEnabled = 0;
- if (loadPreferencesFile(path)) ok = 1;
- }
+ if (loadPreferencesFile(path))
+ {
+ ok = 1;
+ oldPreferencesEnabled = 0;
+ }
free(path);
}
@@ -2070,7 +2074,7 @@
void
restartBrailleDriver (void) {
stopBrailleDriver();
- logMessage(LOG_INFO, gettext("reinitializing braille driver"));
+ logMessage(LOG_INFO, "%s", gettext("reinitializing braille driver"));
tryBrailleDriver();
}
@@ -2358,6 +2362,7 @@
closeTuneDevice(1);
}
+#ifdef HAVE_WRITE
static void
exitPidFile (void) {
unlink(opt_pidFile);
@@ -2386,6 +2391,7 @@
return created;
}
+#endif
#if defined(__MINGW32__)
static void
@@ -2456,7 +2462,7 @@
free(variableName);
}
-#elif defined(__MSDOS__)
+#elif defined(__MSDOS__) || !defined (HAVE_WRITE)
#else /* Unix */
static void
@@ -2523,7 +2529,7 @@
}
}
-void
+int
startup (int argc, char *argv[]) {
{
static const OptionsDescriptor descriptor = {
@@ -2533,7 +2539,8 @@
.configurationFile = &opt_configurationFile,
.applicationName = "brltty"
};
- processOptions(&descriptor, &argc, &argv);
+ if (processOptions(&descriptor, &argc, &argv) < 0)
+ return 1;
}
{
@@ -2608,7 +2615,7 @@
identifySpeechDrivers(1);
#endif /* ENABLE_SPEECH_SUPPORT */
- exit(0);
+ return 1;
}
#ifdef __MINGW32__
@@ -2630,6 +2637,8 @@
#endif /* __MINGW32__ */
if (opt_verify) opt_noDaemon = 1;
+
+#if 0
if (!opt_noDaemon
#ifdef __MINGW32__
&& !isWindowsService
@@ -2683,6 +2692,7 @@
}
#endif /* __MINGW32__ */
}
+#endif
/*
* From this point, all IO functions as printf, puts, perror, etc. can't be
@@ -2690,9 +2700,12 @@
* be used instead.
*/
+#if 0
atexit(exitTunes);
+#endif
suppressTuneDeviceOpenErrors();
+#if 0
{
char *directory;
if ((directory = getWorkingDirectory())) {
@@ -2702,6 +2715,7 @@
logMessage(LOG_ERR, "%s: %s", gettext("cannot determine working directory"), strerror(errno));
}
}
+#endif
logMessage(LOG_INFO, "%s: %s", gettext("Writable Directory"), opt_writableDirectory);
writableDirectory = opt_writableDirectory;
@@ -2809,7 +2823,7 @@
/* The device(s) the braille display might be connected to. */
if (!*opt_brailleDevice) {
logMessage(LOG_ERR, gettext("braille device not specified"));
- exit(4);
+ return 1;
}
brailleDevices = splitString(opt_brailleDevice, ',', NULL);
@@ -2841,5 +2855,6 @@
}
#endif /* ENABLE_SPEECH_SUPPORT */
- if (opt_verify) exit(0);
+ if (opt_verify) return 1;
+ return 0;
}
Only in grub-core/braille/brltty/Programs: config.c.rej
Only in /home/phcoder/repos/brltty/Programs: config.o
Only in /home/phcoder/repos/brltty/Programs: ctb_compile.o
diff -ur /home/phcoder/repos/brltty/Programs/ctb_translate.c grub-core/braille/brltty/Programs/ctb_translate.c
--- /home/phcoder/repos/brltty/Programs/ctb_translate.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/ctb_translate.c 2012-03-23 21:28:59.592721546 +0100
@@ -1441,6 +1441,7 @@
static int
contractTextExternally (void) {
+#ifdef HAVE_PIPES
setOffset();
while (++src < srcmax) clearOffset();
@@ -1453,6 +1454,7 @@
}
stopContractionCommand(table);
+#endif
return 0;
}
Only in /home/phcoder/repos/brltty/Programs: ctb_translate.o
Only in /home/phcoder/repos/brltty/Programs: cut.o
Only in /home/phcoder/repos/brltty/Programs: dataarea.o
diff -ur /home/phcoder/repos/brltty/Programs/datafile.c grub-core/braille/brltty/Programs/datafile.c
--- /home/phcoder/repos/brltty/Programs/datafile.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/datafile.c 2012-03-23 21:28:59.596721548 +0100
@@ -74,7 +74,7 @@
}
void
-reportDataError (DataFile *file, char *format, ...) {
+reportDataError (DataFile *file, const char *format, ...) {
char message[0X100];
{
diff -ur /home/phcoder/repos/brltty/Programs/datafile.h grub-core/braille/brltty/Programs/datafile.h
--- /home/phcoder/repos/brltty/Programs/datafile.h 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/datafile.h 2012-03-23 21:28:59.596721548 +0100
@@ -33,7 +33,7 @@
typedef int DataProcessor (DataFile *file, void *data);
extern int processDataFile (const char *name, DataProcessor processor, void *data);
-extern void reportDataError (DataFile *file, char *format, ...) PRINTF(2, 3);
+extern void reportDataError (DataFile *file, const char *format, ...) PRINTF(2, 3);
extern int processDataStream (
Queue *variables,
Only in /home/phcoder/repos/brltty/Programs: datafile.o
diff -ur /home/phcoder/repos/brltty/Programs/device.c grub-core/braille/brltty/Programs/device.c
--- /home/phcoder/repos/brltty/Programs/device.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/device.c 2012-03-23 21:28:59.596721548 +0100
@@ -29,6 +29,7 @@
#include "file.h"
#include "misc.h"
+#if 0
int
getConsole (void) {
static int console = -1;
@@ -151,6 +152,8 @@
return device;
}
+#endif
+
int
isQualifiedDevice (const char **identifier, const char *qualifier) {
size_t count = strcspn(*identifier, ":");
Only in /home/phcoder/repos/brltty/Programs: device.o
Only in /home/phcoder/repos/brltty/Programs: driver.o
Only in /home/phcoder/repos/brltty/Programs: drivers.o
diff -ur /home/phcoder/repos/brltty/Programs/file.c grub-core/braille/brltty/Programs/file.c
--- /home/phcoder/repos/brltty/Programs/file.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/file.c 2012-03-23 21:28:59.596721548 +0100
@@ -149,6 +149,8 @@
return joinStrings(strings, count);
}
+#if 0
+
int
testPath (const char *path) {
return access(path, F_OK) != -1;
@@ -176,7 +178,7 @@
}
if (mkdir(path
-#ifndef __MINGW32__
+#if 0
,S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH
#endif /* __MINGW32__ */
) != -1) {
@@ -190,14 +192,17 @@
return 0;
}
+#endif
const char *writableDirectory = NULL;
const char *
getWritableDirectory (void) {
+#if 0
if (writableDirectory && *writableDirectory)
if (ensureDirectory(writableDirectory))
return writableDirectory;
+#endif
return NULL;
}
@@ -209,6 +214,7 @@
return NULL;
}
+#if 0
char *
getWorkingDirectory (void) {
size_t size = 0X80;
@@ -254,43 +260,28 @@
return strdup(path);
}
-const char *
-getOverrideDirectory (void) {
- static const char *directory = NULL;
-
- if (!directory) {
- static const char subdirectory[] = "." PACKAGE_NAME;
-
- {
- char *homeDirectory = getHomeDirectory();
+#endif
- if (homeDirectory) {
- directory = makePath(homeDirectory, subdirectory);
- free(homeDirectory);
- if (directory) goto gotDirectory;
- }
- }
-
- {
- char *workingDirectory = getWorkingDirectory();
+#include <grub/env.h>
- if (workingDirectory) {
- directory = makePath(workingDirectory, subdirectory);
- free(workingDirectory);
- if (directory) goto gotDirectory;
- }
- }
-
- directory = "";
- logMessage(LOG_WARNING, "no override directory");
- goto ready;
-
- gotDirectory:
- logMessage(LOG_INFO, "Override Directory: %s", directory);
- }
-
-ready:
- return *directory? directory: NULL;
+const char *
+getOverrideDirectory (void) {
+ static char *directory = NULL;
+ const char *prefix;
+ char *ptr;
+
+ if (directory)
+ return directory;
+
+ prefix = grub_env_get ("prefix");
+ if (!prefix)
+ return NULL;
+ directory = malloc (grub_strlen (prefix) + sizeof ("/brltty"));
+ if (!directory)
+ return NULL;
+ ptr = stpcpy (directory, prefix);
+ grub_memcpy (ptr, "/brltty", sizeof ("/brltty"));
+ return directory;
}
FILE *
@@ -298,7 +289,7 @@
FILE *file = fopen(path, mode);
if (file) {
- logMessage(LOG_DEBUG, "file opened: %s fd=%d", path, fileno(file));
+ logMessage(LOG_DEBUG, "file opened: %s fd=%p", path, file);
} else {
logMessage((optional && (errno == ENOENT))? LOG_DEBUG: LOG_ERR,
"cannot open file: %s: %s", path, strerror(errno));
@@ -317,13 +308,13 @@
if (!overrideDirectory) {
overridePath = NULL;
} else if ((overridePath = makePath(overrideDirectory, name))) {
- if (testPath(overridePath)) {
- file = openFile(overridePath, mode, optional);
+ file = openFile(overridePath, mode, optional);
+ if (file)
goto done;
- }
}
if (!(file = openFile(path, mode, optional))) {
+#if 0
if ((*mode == 'w') || (*mode == 'a')) {
if (errno == ENOENT) {
char *directory = getPathDirectory(path);
@@ -346,6 +337,7 @@
}
}
}
+#endif
}
done:
diff -ur /home/phcoder/repos/brltty/Programs/io_misc.c grub-core/braille/brltty/Programs/io_misc.c
--- /home/phcoder/repos/brltty/Programs/io_misc.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/io_misc.c 2012-03-23 21:28:59.596721548 +0100
@@ -40,6 +40,7 @@
static int
awaitFileDescriptor (int fileDescriptor, int milliseconds, int output) {
+#if 0
#ifdef __MSDOS__
int left = milliseconds * 1000;
#endif /* __MSDOS__ */
@@ -114,6 +115,7 @@
errno = EAGAIN;
return 0;
}
+#endif
}
int
@@ -127,6 +129,7 @@
void *buffer, size_t *offset, size_t count,
int initialTimeout, int subsequentTimeout
) {
+#if 0
#ifdef __MSDOS__
int tried = 0;
goto noInput;
@@ -176,6 +179,7 @@
*offset += amount;
count -= amount;
}
+#endif
return 1;
}
@@ -195,6 +199,7 @@
return awaitFileDescriptor(fileDescriptor, milliseconds, 1);
}
+#ifdef HAVE_WRITE
ssize_t
writeData (int fileDescriptor, const void *buffer, size_t size) {
const unsigned char *address = buffer;
@@ -233,6 +238,7 @@
return address - start;
}
}
+#endif
int
changeOpenFlags (int fileDescriptor, int flagsToClear, int flagsToSet) {
diff -ur /home/phcoder/repos/brltty/Programs/lock.c grub-core/braille/brltty/Programs/lock.c
--- /home/phcoder/repos/brltty/Programs/lock.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/lock.c 2012-03-23 21:28:59.600721549 +0100
@@ -23,7 +23,7 @@
#ifdef __MINGW32__
#include "win_pthread.h"
-#elif defined(__MSDOS__)
+#elif defined(__MSDOS__) || 1
#else /* posix threads */
#include <pthread.h>
@@ -31,7 +31,7 @@
#include "lock.h"
-#ifdef __MSDOS__
+#if defined (__MSDOS__) || 1
LockDescriptor *
newLockDescriptor (void) {
return NULL;
Only in /home/phcoder/repos/brltty/Programs: lock.o
diff -ur /home/phcoder/repos/brltty/Programs/log.c grub-core/braille/brltty/Programs/log.c
--- /home/phcoder/repos/brltty/Programs/log.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/log.c 2012-03-23 22:58:46.392844455 +0100
@@ -95,7 +95,8 @@
char buffer[0X20];
int length;
- gettimeofday(&now, NULL);
+ now.tv_sec = time (NULL);
+ now.tv_usec = 0;
localtime_r(&now.tv_sec, &description);
length = strftime(buffer, sizeof(buffer), "%Y-%m-%d@%H:%M:%S", &description);
fprintf(logFile, "%.*s.%03ld ", length, buffer, now.tv_usec/1000);
diff -ur /home/phcoder/repos/brltty/Programs/menu.c grub-core/braille/brltty/Programs/menu.c
--- /home/phcoder/repos/brltty/Programs/menu.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/menu.c 2012-03-23 21:28:59.600721549 +0100
@@ -331,6 +331,7 @@
files->paths[files->count] = NULL;
index = files->count;
+#if 0
{
#ifdef HAVE_FCHDIR
int originalDirectory = open(".", O_RDONLY);
@@ -405,6 +406,7 @@
#endif /* HAVE_FCHDIR */
}
}
+#endif
qsort(&files->paths[index], files->count-index, sizeof(*files->paths), qsortCompare_fileNames);
if (files->none) files->paths[--index] = "";
diff -ur /home/phcoder/repos/brltty/Programs/misc.c grub-core/braille/brltty/Programs/misc.c
--- /home/phcoder/repos/brltty/Programs/misc.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/misc.c 2012-03-23 23:13:52.036865126 +0100
@@ -27,7 +27,7 @@
static void
noMemory (void) {
logMessage(LOG_CRIT, "insufficient memory: %s", strerror(errno));
- exit(3);
+ grub_fatal ("out of memory");
}
void *
diff -ur /home/phcoder/repos/brltty/Programs/notes.h grub-core/braille/brltty/Programs/notes.h
--- /home/phcoder/repos/brltty/Programs/notes.h 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/notes.h 2012-03-23 21:28:59.600721549 +0100
@@ -37,7 +37,9 @@
extern const NoteMethods midiMethods;
extern const NoteMethods fmMethods;
+#ifdef HAVE_FLOAT
extern const float noteFrequencies[];
+#endif
extern const unsigned int noteCount;
#ifdef __cplusplus
diff -ur /home/phcoder/repos/brltty/Programs/options.c grub-core/braille/brltty/Programs/options.c
--- /home/phcoder/repos/brltty/Programs/options.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/options.c 2012-03-23 23:08:21.112857569 +0100
@@ -60,13 +60,17 @@
*setting = strdupWrapper(value);
} else if (prepend) {
char *area = mallocWrapper(strlen(value) + 1 + strlen(*setting) + 1);
- sprintf(area, "%s,%s", value, *setting);
+ char *ptr = stpcpy (area, value);
+ *ptr++ = ',';
+ ptr = stpcpy (ptr, *setting);
+ *ptr = 0;
free(*setting);
*setting = area;
} else {
size_t length = strlen(*setting);
*setting = reallocWrapper(*setting, length+1+strlen(value)+1);
- sprintf((*setting)+length, ",%s", value);
+ *((*setting)+length) = ',';
+ grub_strcpy ((*setting)+length + 1, value);
}
}
}
@@ -231,7 +235,7 @@
}
}
-static void
+static int
processCommandLine (
OptionProcessingInformation *info,
int *argumentCount,
@@ -276,7 +280,10 @@
opt->name = strdupWrapper(entry->word + length);
} else {
char *name = mallocWrapper(length + strlen(entry->word) + 1);
- sprintf(name, "%s%s", prefix, entry->word);
+ char *ptr;
+ ptr = stpcpy (name, prefix);
+ ptr = stpcpy (ptr, entry->word);
+ *ptr = 0;
opt->name = name;
}
@@ -487,7 +494,7 @@
if (optHelp) {
printHelp(info, stdout, 79, argumentsSummary, optHelpAll);
- exit(0);
+ return 1;
}
#ifdef HAVE_GETOPT_LONG
@@ -499,6 +506,7 @@
}
}
#endif /* HAVE_GETOPT_LONG */
+ return 0;
}
static void
@@ -506,12 +514,12 @@
OptionProcessingInformation *info,
const char *parameterName
) {
- char *parameterString;
+ const char *parameterString;
int allocated = 0;
if ((parameterString = getBootParameters(parameterName))) {
allocated = 1;
- } else if ((parameterString = getenv(parameterName))) {
+ } else if ((parameterString = getenv(parameterName))) {
allocated = 0;
} else {
return;
@@ -544,7 +552,7 @@
deallocateStrings(parameters);
}
- if (allocated) free(parameterString);
+ if (allocated) free((char *) parameterString);
}
static void
@@ -558,7 +566,11 @@
const OptionEntry *option = &info->optionTable[optionIndex];
if ((option->flags & OPT_Environ) && option->word) {
char name[prefixLength + 1 + strlen(option->word) + 1];
- sprintf(name, "%s_%s", prefix, option->word);
+ char *ptr;
+ ptr = grub_stpcpy (name, prefix);
+ *ptr++ = '_';
+ ptr = grub_stpcpy (ptr, option->word);
+ *ptr = 0;
{
char *character = name;
@@ -573,7 +585,7 @@
}
{
- char *setting = getenv(name);
+ const char *setting = getenv(name);
if (setting && *setting) ensureSetting(info, option, setting);
}
}
@@ -713,7 +725,8 @@
}
prepareProgram(*argumentCount, *argumentVector);
- processCommandLine(&info, argumentCount, argumentVector, descriptor->argumentsSummary);
+ if (processCommandLine(&info, argumentCount, argumentVector, descriptor->argumentsSummary))
+ return -1;
{
int configurationFileSpecified = descriptor->configurationFile && *descriptor->configurationFile;
Only in /home/phcoder/repos/brltty/Programs: options.o
diff -ur /home/phcoder/repos/brltty/Programs/parse.c grub-core/braille/brltty/Programs/parse.c
--- /home/phcoder/repos/brltty/Programs/parse.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/parse.c 2012-03-23 21:28:59.600721549 +0100
@@ -130,6 +130,7 @@
return 0;
}
+#ifdef HAVE_FLOAT
int
isFloat (float *value, const char *string) {
if (*string) {
@@ -142,6 +143,7 @@
}
return 0;
}
+#endif
int
isLogLevel (int *level, const char *string) {
@@ -183,6 +185,8 @@
return 1;
}
+#ifdef HAVE_FLOAT
+
int
validateFloat (float *value, const char *string, const float *minimum, const float *maximum) {
if (*string) {
@@ -195,6 +199,8 @@
return 1;
}
+#endif
+
int
validateChoice (unsigned int *value, const char *string, const char *const *choices) {
int length = strlen(string);
@@ -324,7 +330,8 @@
}
void
-logParameters (const char *const *names, char **values, char *description) {
+logParameters (const char *const *names, char **values,
+ const char *description) {
if (names && values) {
while (*names) {
logMessage(LOG_INFO, "%s: %s=%s", description, *names, *values);
diff -ur /home/phcoder/repos/brltty/Programs/parse.h grub-core/braille/brltty/Programs/parse.h
--- /home/phcoder/repos/brltty/Programs/parse.h 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/parse.h 2012-03-23 21:28:59.600721549 +0100
@@ -31,18 +31,24 @@
extern int isInteger (int *value, const char *string);
extern int isUnsignedInteger (unsigned int *value, const char *string);
+#ifdef HAVE_FLOAT
extern int isFloat (float *value, const char *string);
+#endif
extern int isLogLevel (int *level, const char *string);
extern int validateInteger (int *value, const char *string, const int *minimum, const int *maximum);
+#ifdef HAVE_FLOAT
extern int validateFloat (float *value, const char *string, const float *minimum, const float *maximum);
+#endif
extern int validateChoice (unsigned int *value, const char *string, const char *const *choices);
extern int validateFlag (unsigned int *value, const char *string, const char *on, const char *off);
extern int validateOnOff (unsigned int *value, const char *string);
extern int validateYesNo (unsigned int *value, const char *string);
extern char **getParameters (const char *const *names, const char *qualifier, const char *parameters);
-extern void logParameters (const char *const *names, char **values, char *description);
+void
+logParameters (const char *const *names, char **values,
+ const char *description);
#ifdef __cplusplus
}
Only in /home/phcoder/repos/brltty/Programs: parse.o
Only in /home/phcoder/repos/brltty/Programs: pcm.o
diff -ur /home/phcoder/repos/brltty/Programs/pid.h grub-core/braille/brltty/Programs/pid.h
--- /home/phcoder/repos/brltty/Programs/pid.h 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/pid.h 2012-03-23 21:28:59.600721549 +0100
@@ -28,7 +28,7 @@
#define PRIpid "lu"
#define SCNpid "lu"
-#elif defined(__MSDOS__)
+#elif defined(__MSDOS__) || 1
typedef int ProcessIdentifier;
#define PRIpid "d"
#define SCNpid "d"
Only in /home/phcoder/repos/brltty/Programs: pid.o
diff -ur /home/phcoder/repos/brltty/Programs/prefs.c grub-core/braille/brltty/Programs/prefs.c
--- /home/phcoder/repos/brltty/Programs/prefs.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/prefs.c 2012-03-23 21:28:59.600721549 +0100
@@ -437,8 +437,12 @@
char *
makePreferencesFilePath (const char *name) {
+#ifdef HAVE_WRITE
if (!name) name = PREFERENCES_FILE;
return makePath(STATE_DIRECTORY, name);
+#else
+ return NULL;
+#endif
}
static int
diff -ur /home/phcoder/repos/brltty/Programs/program.c grub-core/braille/brltty/Programs/program.c
--- /home/phcoder/repos/brltty/Programs/program.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/program.c 2012-03-23 21:28:59.604721549 +0100
@@ -55,6 +55,7 @@
#endif /* ENABLE_I18N_SUPPORT */
}
+#ifdef HAVE_EXECUTABLES
static char *
testProgram (const char *directory, const char *name) {
char *path;
@@ -92,6 +93,7 @@
return path;
}
+#endif
void
prepareProgram (int argumentCount, char **argumentVector) {
@@ -101,6 +103,7 @@
prepareLocale();
+#ifdef HAVE_EXECUTABLES
if (!(programPath = getProgramPath())) programPath = argumentVector[0];
if (!isExplicitPath(programPath)) {
@@ -122,19 +125,14 @@
}
}
#endif /* defined(HAVE_REALPATH) && defined(PATH_MAX) */
-
- if (!isAbsolutePath(programPath)) {
- char *directory;
-
- if ((directory = getWorkingDirectory())) {
- char *path;
- if ((path = makePath(directory, programPath))) programPath = path;
- free(directory);
- }
- }
}
programName = locatePathName(programPath);
+#else
+ programName = "brltty";
+ programPath = "brltty";
+#endif
+
setLogPrefix(programName);
}
@@ -150,6 +148,7 @@
fixInstallPaths (char **const *paths) {
static const char *programDirectory = NULL;
+#ifdef HAVE_EXECUTABLES
if (!programDirectory) {
if (!(programDirectory = getPathDirectory(programPath))) {
logMessage(LOG_WARNING, gettext("cannot determine program directory"));
@@ -172,6 +171,7 @@
paths += 1;
}
+#endif
}
void
@@ -182,6 +182,7 @@
int
createPidFile (const char *path, ProcessIdentifier pid) {
+#ifdef HAVE_FILE_WRITE
if (!pid) pid = getProcessIdentifier();
if (path && *path) {
@@ -274,6 +275,7 @@
break;
}
}
+#endif
return 0;
}
diff -ur /home/phcoder/repos/brltty/Programs/routing.c grub-core/braille/brltty/Programs/routing.c
--- /home/phcoder/repos/brltty/Programs/routing.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/routing.c 2012-03-23 22:57:52.012843217 +0100
@@ -52,7 +52,9 @@
} RoutingResult;
typedef struct {
+#ifdef HAVE_SIGNALS
sigset_t signalMask;
+#endif
int screenNumber;
int screenRows;
@@ -191,7 +193,7 @@
int moved = 0;
struct timeval start;
- gettimeofday(&start, NULL);
+ gettimeofday_fake(&start, NULL);
while (1) {
long time;
diff -ur /home/phcoder/repos/brltty/Programs/spk.h grub-core/braille/brltty/Programs/spk.h
--- /home/phcoder/repos/brltty/Programs/spk.h 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/spk.h 2012-03-23 21:28:59.604721549 +0100
@@ -39,15 +39,21 @@
extern void setSpeechVolume (SpeechSynthesizer *spk, int setting, int say);
extern unsigned int getIntegerSpeechVolume (unsigned char setting, unsigned int normal);
+#ifdef HAVE_FLOAT
extern float getFloatSpeechVolume (unsigned char setting);
+#endif
extern void setSpeechRate (SpeechSynthesizer *spk, int setting, int say);
extern unsigned int getIntegerSpeechRate (unsigned char setting, unsigned int normal);
+#ifdef HAVE_FLOAT
extern float getFloatSpeechRate (unsigned char setting);
+#endif
extern void setSpeechPitch (SpeechSynthesizer *spk, int setting, int say);
extern unsigned int getIntegerSpeechPitch (unsigned char setting, unsigned int normal);
+#ifdef HAVE_FLOAT
extern float getFloatSpeechPitch (unsigned char setting);
+#endif
extern void setSpeechPunctuation (SpeechSynthesizer *spk, SpeechPunctuation setting, int say);
diff -ur /home/phcoder/repos/brltty/Programs/timing.c grub-core/braille/brltty/Programs/timing.c
--- /home/phcoder/repos/brltty/Programs/timing.c 2012-03-22 17:40:51.067380000 +0100
+++ grub-core/braille/brltty/Programs/timing.c 2012-03-23 22:59:06.488844918 +0100
@@ -31,7 +31,9 @@
void
approximateDelay (int milliseconds) {
if (milliseconds > 0) {
-#if defined(__MINGW32__)
+#if 1
+ grub_millisleep (milliseconds);
+#elif defined(__MINGW32__)
Sleep(milliseconds);
#elif defined(__MSDOS__)
tsr_usleep(milliseconds*1000);
@@ -56,16 +58,19 @@
long int
millisecondsSince (const struct timeval *from) {
struct timeval now;
- gettimeofday(&now, NULL);
+ gettimeofday_fake(&now, NULL);
return millisecondsBetween(from, &now);
}
void
accurateDelay (int milliseconds) {
+#if 1
+ grub_millisleep (milliseconds);
+#else
static int tickLength = 0;
struct timeval start;
- gettimeofday(&start, NULL);
+ gettimeofday_fake(&start, NULL);
if (!tickLength) {
#if defined(_SC_CLK_TCK)
@@ -91,6 +96,7 @@
tsr_usleep(1);
#endif /* __MSDOS__ */
}
+#endif
}
int
@@ -99,6 +105,6 @@
if (milliseconds) return millisecondsSince(&start) >= milliseconds;
- gettimeofday(&start, NULL);
+ gettimeofday_fake(&start, NULL);
return 1;
}
diff -ur /home/phcoder/repos/brltty/Programs/tunes.c grub-core/braille/brltty/Programs/tunes.c
--- /home/phcoder/repos/brltty/Programs/tunes.c 2012-03-15 14:54:22.122970000 +0100
+++ grub-core/braille/brltty/Programs/tunes.c 2012-03-23 21:28:59.604721549 +0100
@@ -302,6 +302,7 @@
NULL, 0, elements_routing_failed
};
+#ifdef HAVE_FLOAT
const float noteFrequencies[] = {
/* 0 -5C */ 8.176,
/* 1 -5C# */ 8.662,
@@ -433,6 +434,7 @@
/* 127 +5G */ 12543.854
};
const unsigned int noteCount = ARRAY_COUNT(noteFrequencies);
+#endif
static const NoteMethods *noteMethods = NULL;
static NoteDevice *noteDevice = NULL;
/home/phcoder/grub2/bzr/post-20/brl/grub-core/lib/libgcrypt-grub/cipher/rijndael.c:
In function 'do_setkey':
/home/phcoder/grub2/bzr/post-20/brl/grub-core/lib/libgcrypt-grub/cipher/rijndael.c:173:21:
warning: comparison between signed and unsigned integer expressions
[-Wsign-compare]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/menu.c:32:2:
warning: #warning file globbing support not available on this platform [-Wcpp]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/auth.c:234:2:
warning: #warning peer credentials support not available on this platform
[-Wcpp]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/file.c:529:2:
warning: #warning file lock support not available on this platform [-Wcpp]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/kbd_none.c:19:2:
warning: #warning keyboard monitor support not available on this platform
[-Wcpp]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty_wrap/sys_grub.c:23:2:
warning: #warning boot parameter retrieval not available on this platform
[-Wcpp]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Drivers/Braille/Baum/braille.c:
In function 'configureUsbPort':
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Drivers/Braille/Baum/braille.c:2525:5:
warning: initialized field overwritten [-Woverride-init]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Drivers/Braille/Baum/braille.c:2525:5:
warning: (near initialization for 'parameters.baud') [-Woverride-init]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Drivers/Braille/Baum/braille.c:2527:3:
warning: initialized field overwritten [-Woverride-init]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Drivers/Braille/Baum/braille.c:2527:3:
warning: (near initialization for 'parameters.parity') [-Woverride-init]
In file included from
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/brl.c:47:0:
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/brl_driver.h:77:28:
warning: redundant redeclaration of 'noBraille' [-Wredundant-decls]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/brl.h:126:28:
note: previous declaration of 'noBraille' was here
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/brltty.c:
In function 'testProgramTermination':
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/brltty.c:163:33:
warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/brltty.c:
At top level:
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/brltty.c:131:1:
warning: 'exitSessions' defined but not used [-Wunused-function]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/brltty.c:137:1:
warning: 'exitLog' defined but not used [-Wunused-function]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/brltty.c:167:1:
warning: 'terminationHandler' defined but not used [-Wunused-function]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:334:5:
warning: initialization from incompatible pointer type [enabled by default]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:334:5:
warning: (near initialization for 'programOptions[10].setting.string')
[enabled by default]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:344:5:
warning: initialization from incompatible pointer type [enabled by default]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:344:5:
warning: (near initialization for 'programOptions[11].setting.string')
[enabled by default]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:353:5:
warning: initialization from incompatible pointer type [enabled by default]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:353:5:
warning: (near initialization for 'programOptions[12].setting.string')
[enabled by default]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:1761:1:
warning: no previous prototype for 'initializeBraille' [-Wmissing-prototypes]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:
In function 'startup':
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:2550:7:
warning: initialization from incompatible pointer type [enabled by default]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:2550:7:
warning: (near initialization for 'paths[2]') [enabled by default]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:2825:5:
warning: format not a string literal and no format arguments
[-Wformat-security]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:
At top level:
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:663:1:
warning: 'exitKeyTable' defined but not used [-Wunused-function]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:2082:1:
warning: 'exitBrailleDriver' defined but not used [-Wunused-function]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:2355:1:
warning: 'exitScreen' defined but not used [-Wunused-function]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/config.c:2361:1:
warning: 'exitTunes' defined but not used [-Wunused-function]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/ctb_translate.c:1139:1:
warning: 'putExternalRequests' defined but not used [-Wunused-function]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/ctb_translate.c:1403:1:
warning: 'getExternalResponses' defined but not used [-Wunused-function]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/menu.c:32:2:
warning: #warning file globbing support not available on this platform [-Wcpp]
In file included from
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/scr.c:55:0:
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/scr_driver.h:48:30:
warning: redundant redeclaration of 'noScreen' [-Wredundant-decls]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/scr.h:208:27:
note: previous declaration of 'noScreen' was here
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/scr.c:177:1:
warning: no previous prototype for 'haveScreen' [-Wmissing-prototypes]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/auth.c:234:2:
warning: #warning peer credentials support not available on this platform
[-Wcpp]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/datafile.c:
In function 'getGlobalDataVariables':
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/datafile.c:267:1:
warning: old-style function definition [-Wold-style-definition]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/datafile.c:
In function 'parseDataString':
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/datafile.c:535:22:
warning: variable 'name' set but not used [-Wunused-but-set-variable]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/file.c:529:2:
warning: #warning file lock support not available on this platform [-Wcpp]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/io_misc.c:
In function 'awaitFileDescriptor':
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/io_misc.c:119:1:
warning: no return statement in function returning non-void [-Wreturn-type]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/kbd_none.c:19:2:
warning: #warning keyboard monitor support not available on this platform
[-Wcpp]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/ktb_compile.c:1340:1:
warning: no previous prototype for 'finishKeyTable' [-Wmissing-prototypes]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/log.c: In
function 'openSystemLog':
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/log.c:115:9:
warning: unused variable 'flags' [-Wunused-variable]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/program.c:
In function 'prepareLocale':
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/program.c:50:3:
warning: statement with no effect [-Wunused-value]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/program.c:
In function 'fixInstallPaths':
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/program.c:149:22:
warning: unused variable 'programDirectory' [-Wunused-variable]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty/Programs/scr_base.c:136:1:
warning: no previous prototype for 'unhighlightRegion_BaseScreen'
[-Wmissing-prototypes]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/braille/brltty_wrap/sys_grub.c:23:2:
warning: #warning boot parameter retrieval not available on this platform
[-Wcpp]
/home/phcoder/grub2/bzr/post-20/brl/grub-core/lib/libgcrypt-grub/cipher/rijndael.c:
In function 'do_setkey':
/home/phcoder/grub2/bzr/post-20/brl/grub-core/lib/libgcrypt-grub/cipher/rijndael.c:173:21:
warning: comparison between signed and unsigned integer expressions
[-Wsign-compare]
_______________________________________________
This message was sent via the BRLTTY mailing list.
To post a message, send an e-mail to: [email protected]
For general information, go to: http://mielke.cc/mailman/listinfo/brltty
