[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [MiNT] FreeMiNT CVS kernel patch
On Sun, 2008-01-06 at 10:13 +0100, Vincent Rivière wrote:
> Alan Hourihane wrote :
> > Here's a patch against the current CVS to allow FreeMiNT to build with
> > GCC 4.
>
> I've just quickly looked at the patch.
> The changes in mfp.c smells bad...
> You replaced the assembly labels mfp1_dcdint and friends by real
> functions, which contains an extra prologue/epilogue.
>
> What was the original problem ?
Mmm. Just reverted the changes and I can't replicate my original problem
now, so I've just reverted the mfp.c part of the patch.
Attached is a new patch without mfp.c changes.
Alan.
Index: sys/Makefile.objs
===================================================================
RCS file: /mint/freemint/sys/Makefile.objs,v
retrieving revision 1.7
diff -u -r1.7 Makefile.objs
--- sys/Makefile.objs 13 Jul 2007 21:32:48 -0000 1.7
+++ sys/Makefile.objs 6 Jan 2008 11:35:21 -0000
@@ -42,40 +42,40 @@
NOCFLAGS-profil.c = -pg
NOCFLAGS-update.c = -pg
-NOCFLAGS-bios.c = -mcfv4e
-# CFLAGS-bios.c = -m68000
-NOCFLAGS-biosfs.c = -mcfv4e
-# CFLAGS-biosfs.c = -m68000
-NOCFLAGS-dos.c = -mcfv4e
-# CFLAGS-dos.c = -m68000
-NOCFLAGS-dosfile.c = -mcfv4e
-# CFLAGS-dosfile.c = -m68000
-NOCFLAGS-fatfs.c = -mcfv4e
-# CFLAGS-fatfs.c = -m68000
-NOCFLAGS-k_exec.c = -mcfv4e
-# CFLAGS-k_exec.c = -m68000
-NOCFLAGS-k_exit.c = -mcfv4e
-# CFLAGS-k_exit.c = -m68000
-NOCFLAGS-k_fork.c = -mcfv4e
-# CFLAGS-k_fork.c = -m68000
-NOCFLAGS-module.c = -mcfv4e
-# CFLAGS-module.c = -m68000
-NOCFLAGS-proc.c = -mcfv4e
-# CFLAGS-proc.c = -m68000
-NOCFLAGS-procfs.c = -mcfv4e
-# CFLAGS-procfs.c = -m68000
-NOCFLAGS-ptrace.c = -mcfv4e
-# CFLAGS-ptrace.c = -m68000
-NOCFLAGS-random.c = -mcfv4e
-# CFLAGS-random.c = -m68000
-NOCFLAGS-rendez.c = -mcfv4e
-# CFLAGS-rendez.c = -m68000
-NOCFLAGS-signal.c = -mcfv4e
-# CFLAGS-signal.c = -m68000
-NOCFLAGS-timeout.c = -mcfv4e
-# CFLAGS-timeout.c = -m68000
-NOCFLAGS-xbios.c = -mcfv4e
-# CFLAGS-xbios.c = -m68000
+NOCFLAGS-bios.c = $(MODEL)
+CFLAGS-bios.c = -m68000
+NOCFLAGS-biosfs.c = $(MODEL)
+CFLAGS-biosfs.c = -m68000
+NOCFLAGS-dos.c = $(MODEL)
+CFLAGS-dos.c = -m68000
+NOCFLAGS-dosfile.c = $(MODEL)
+CFLAGS-dosfile.c = -m68000
+NOCFLAGS-fatfs.c = $(MODEL)
+CFLAGS-fatfs.c = -m68000
+NOCFLAGS-k_exec.c = $(MODEL)
+CFLAGS-k_exec.c = -m68000
+NOCFLAGS-k_exit.c = $(MODEL)
+CFLAGS-k_exit.c = -m68000
+NOCFLAGS-k_fork.c = $(MODEL)
+CFLAGS-k_fork.c = -m68000
+NOCFLAGS-module.c = $(MODEL)
+CFLAGS-module.c = -m68000
+NOCFLAGS-proc.c = $(MODEL)
+CFLAGS-proc.c = -m68000
+NOCFLAGS-procfs.c = $(MODEL)
+CFLAGS-procfs.c = -m68000
+NOCFLAGS-ptrace.c = $(MODEL)
+CFLAGS-ptrace.c = -m68000
+NOCFLAGS-random.c = $(MODEL)
+CFLAGS-random.c = -m68000
+NOCFLAGS-rendez.c = $(MODEL)
+CFLAGS-rendez.c = -m68000
+NOCFLAGS-signal.c = $(MODEL)
+CFLAGS-signal.c = -m68000
+NOCFLAGS-timeout.c = $(MODEL)
+CFLAGS-timeout.c = -m68000
+NOCFLAGS-xbios.c = $(MODEL)
+CFLAGS-xbios.c = -m68000
cflags = $(kernel_cflags)
nocflags = $(kernel_nocflags)
Index: sys/arch/Makefile.objs
===================================================================
RCS file: /mint/freemint/sys/arch/Makefile.objs,v
retrieving revision 1.10
diff -u -r1.10 Makefile.objs
--- sys/arch/Makefile.objs 13 Jul 2007 21:32:49 -0000 1.10
+++ sys/arch/Makefile.objs 6 Jan 2008 11:35:31 -0000
@@ -21,32 +21,51 @@
INCLUDES = -I$(top_srcdir)
DEFINITIONS = $(KERNELDEFAULTDEFS) $(KERNELDEFS)
+ifneq ($(CPU),030)
+NOCFLAGS-context.S = $(MODEL)
+endif
CFLAGS-context.S = -m68030
-NOCFLAGS-context.S = -mcfv4e
+ifneq ($(CPU),030)
+NOCFLAGS-cpu.S = $(MODEL)
+endif
CFLAGS-cpu.S = -m68030
-NOCFLAGS-cpu.S = -m68020-60 -mcfv4e -m68040 -m68060
+ifneq ($(CPU),030)
+NOCFLAGS-detect.S = $(MODEL)
+endif
CFLAGS-detect.S = -m68030
-NOCFLAGS-detect.S = -m68020-60 -mcfv4e -m68040 -m68060
+ifneq ($(CPU),030)
+NOCFLAGS-intr.S = $(MODEL)
+endif
CFLAGS-intr.S = -m68030
-NOCFLAGS-intr.S = -mcfv4e
+ifneq ($(CPU),030)
+NOCFLAGS-mmu030.S = $(MODEL)
+endif
CFLAGS-mmu030.S = -m68030
-NOCFLAGS-mmu030.S = -mcfv4e
+ifneq ($(CPU),040)
+NOCFLAGS-mmu040.S = $(MODEL)
+endif
CFLAGS-mmu040.S = -m68040
-NOCFLAGS-mmu040.S = -mcfv4e
-NOCFLAGS-syscall.S = -mcfv4e
+
+ifneq ($(CPU),020-60)
+NOCFLAGS-syscall.S = $(MODEL)
+endif
CFLAGS-syscall.S = -m68020-60
-NOCFLAGS-user_things.S = -mcfv4e
+ifneq ($(CPU),020)
+NOCFLAGS-user_things.S = $(MODEL)
+endif
CFLAGS-user_things.S = -m68020
-NOCFLAGS-kernel.S = -mcfv4e
+ifneq ($(CPU),000)
+NOCFLAGS-kernel.S = $(MODEL)
+endif
CFLAGS-kernel.S = -m68000
-NOCFLAGS-mprot030.c = -m68000 -m68020 -m68040 -m68060 -m68020-60 -mcfv4e
-NOCFLAGS-mprot040.c = -m68000 -m68020 -m68030 -m68040 -m68020-60 -mcfv4e
+NOCFLAGS-mprot030.c = $(MODEL)
+NOCFLAGS-mprot040.c = $(MODEL)
CFLAGS-mprot030.c = -m68030
CFLAGS-mprot040.c = -m68060
-NOCFLAGS-init_intr.c = -mcfv4e
+NOCFLAGS-init_intr.c = $(MODEL)
CFLAGS-init_intr.c = -m68000
-NOCFLAGS-sig_mach.c = -mcfv4e
+NOCFLAGS-sig_mach.c = $(MODEL)
CFLAGS-sig_mach.c = -m68000
cflags = $(kernel_cflags)
Index: sys/libkern/Makefile.objs
===================================================================
RCS file: /mint/freemint/sys/libkern/Makefile.objs,v
retrieving revision 1.8
diff -u -r1.8 Makefile.objs
--- sys/libkern/Makefile.objs 13 Jul 2007 21:32:52 -0000 1.8
+++ sys/libkern/Makefile.objs 6 Jan 2008 11:35:32 -0000
@@ -17,7 +17,7 @@
all-here: objs
-NOCFLAGS-md5.c = -mcfv4e
+NOCFLAGS-md5.c = $(MODEL)
CFLAGS-md5.c = -m68000
# default overwrites
Index: sys/libkern/asm/Makefile.objs
===================================================================
RCS file: /mint/freemint/sys/libkern/asm/Makefile.objs,v
retrieving revision 1.5
diff -u -r1.5 Makefile.objs
--- sys/libkern/asm/Makefile.objs 3 Dec 2006 19:41:40 -0000 1.5
+++ sys/libkern/asm/Makefile.objs 6 Jan 2008 11:35:32 -0000
@@ -27,15 +27,15 @@
#DEFINITIONS = -DM68030
#endif
-NOCFLAGS-blockcopy.S = -mcfv4e
+NOCFLAGS-blockcopy.S = $(MODEL)
CFLAGS-blockcopy.S = -m68000
-NOCFLAGS-memset.S = -mcfv4e
+NOCFLAGS-memset.S = $(MODEL)
CFLAGS-memset.S = -m68000
-NOCFLAGS-quickmove.S = -mcfv4e
+NOCFLAGS-quickmove.S = $(MODEL)
CFLAGS-quickmove.S = -m68000
-NOCFLAGS-quickswap.S = -mcfv4e
+NOCFLAGS-quickswap.S = $(MODEL)
CFLAGS-quickswap.S = -m68000
-NOCFLAGS-quickzero.S = -mcfv4e
+NOCFLAGS-quickzero.S = $(MODEL)
CFLAGS-quickzero.S = -m68000
# default definitions
Index: tools/cops/phstuff.c
===================================================================
RCS file: /mint/freemint/tools/cops/phstuff.c,v
retrieving revision 1.6
diff -u -r1.6 phstuff.c
--- tools/cops/phstuff.c 2 Jun 2006 08:56:39 -0000 1.6
+++ tools/cops/phstuff.c 6 Jan 2008 11:35:40 -0000
@@ -113,7 +113,7 @@
code_ptr += 254;
else
{
- (unsigned char *)code_ptr += relo_val;
+ code_ptr += relo_val;
*(unsigned long *)code_ptr += (unsigned long)addr;
}
}
Index: tools/cops/wlib.c
===================================================================
RCS file: /mint/freemint/tools/cops/wlib.c,v
retrieving revision 1.2
diff -u -r1.2 wlib.c
--- tools/cops/wlib.c 27 Jun 2004 17:16:27 -0000 1.2
+++ tools/cops/wlib.c 6 Jan 2008 11:35:40 -0000
@@ -43,8 +43,8 @@
/*----------------------------------------------------------------------------------------*/
/* Globale Variablen */
/*----------------------------------------------------------------------------------------*/
-static short app_id;
-static short vdi_handle;
+short app_id;
+short vdi_handle;
static short work_out[57];
static WINDOW *window_list = NULL;
Index: tools/crypto/main.c
===================================================================
RCS file: /mint/freemint/tools/crypto/main.c,v
retrieving revision 1.6
diff -u -r1.6 main.c
--- tools/crypto/main.c 6 Oct 2000 15:57:54 -0000 1.6
+++ tools/crypto/main.c 6 Jan 2008 11:35:40 -0000
@@ -295,30 +295,30 @@
puts (MSG_GREET);
printf (
-"Usage:
- %s [options] device ...
-device: something like d: or L:
-useful options:
- -a# [or --action #]: select action (encipher, decipher, changekey)
- default is encipher
- -b# [or --buffer #]: specify buffer size in kb
- default is %ikb
- -c# [or --cipher #]: select cipher algorithm (blowfish)
- default is blowfish
- -m# [or --mode #]: select mode (robust, fast)
- default is robust
- -h [or --help]: print this message
- -q [or --quiet]: be quiet
- -r# [or --restart #]: restart interrupted session, parameter
- is the generated *.sav file in robust mode
- -t [or --simulate]: testing mode, simulate action without any write
- -v [or --version]: print version
-dangerous options,
-for professionals only:
- -e# [or --end #]: set end position for action
- default is partition end
- -s# [or --start #]: set start position for action
- default is partition start (512)
+"Usage: \
+ %s [options] device ... \
+device: something like d: or L: \
+useful options: \
+ -a# [or --action #]: select action (encipher, decipher, changekey) \
+ default is encipher \
+ -b# [or --buffer #]: specify buffer size in kb \
+ default is %ikb \
+ -c# [or --cipher #]: select cipher algorithm (blowfish) \
+ default is blowfish \
+ -m# [or --mode #]: select mode (robust, fast) \
+ default is robust \
+ -h [or --help]: print this message \
+ -q [or --quiet]: be quiet \
+ -r# [or --restart #]: restart interrupted session, parameter \
+ is the generated *.sav file in robust mode \
+ -t [or --simulate]: testing mode, simulate action without any write \
+ -v [or --version]: print version \
+dangerous options, \
+for professionals only: \
+ -e# [or --end #]: set end position for action \
+ default is partition end \
+ -s# [or --start #]: set start position for action \
+ default is partition start (512) \
", basename (myname), bufsize / 1024);
fflush (stdout);
Index: tools/fdisk/fdisk.c
===================================================================
RCS file: /mint/freemint/tools/fdisk/fdisk.c,v
retrieving revision 1.2
diff -u -r1.2 fdisk.c
--- tools/fdisk/fdisk.c 4 Sep 2000 00:43:40 -0000 1.2
+++ tools/fdisk/fdisk.c 6 Jan 2008 11:35:40 -0000
@@ -2221,32 +2221,32 @@
usage (void)
{
version ();
- printf ("Usage:
- " PROGNAME " [options] device ...
-device: something like /dev/hda or /dev/sda
-useful options:
- -s [or --show-size]: list size of a partition
- -c [or --id]: print or change partition Id
- -l [or --list]: list partitions of each device
- -d [or --dump]: idem, but in a format suitable for later input
- -i [or --increment]: number sectors etc. from 1 instead of from 0
- -uS, -uM: accept/report in units of sectors/MB
- -T [or --list-types]:list the known partition types
- -R [or --re-read]: make kernel reread partition table
- -N# : change only the partition with number #
- -n : do not actually write to disk
- -O file : save the sectors that will be overwritten to file
- -I file : restore these sectors again
- -v [or --version]: print version
- -? [or --help]: print this message
-dangerous options:
- -x [or --show-extended]: also list extended partitions on output
- or expect descriptors for them on input
- -q [or --quiet]: suppress warning messages
- You can override the detected geometry using:
- -S# [or --sectors #]: set the number of sectors to use
- You can disable all consistency checking with:
- -f [or --force]: do what I say, even if it is stupid
+ printf ("Usage: \
+ " PROGNAME " [options] device ... \
+device: something like /dev/hda or /dev/sda \
+useful options: \
+ -s [or --show-size]: list size of a partition \
+ -c [or --id]: print or change partition Id \
+ -l [or --list]: list partitions of each device \
+ -d [or --dump]: idem, but in a format suitable for later input \
+ -i [or --increment]: number sectors etc. from 1 instead of from 0 \
+ -uS, -uM: accept/report in units of sectors/MB \
+ -T [or --list-types]:list the known partition types \
+ -R [or --re-read]: make kernel reread partition table \
+ -N# : change only the partition with number # \
+ -n : do not actually write to disk \
+ -O file : save the sectors that will be overwritten to file \
+ -I file : restore these sectors again \
+ -v [or --version]: print version \
+ -? [or --help]: print this message \
+dangerous options: \
+ -x [or --show-extended]: also list extended partitions on output \
+ or expect descriptors for them on input \
+ -q [or --quiet]: suppress warning messages \
+ You can override the detected geometry using: \
+ -S# [or --sectors #]: set the number of sectors to use \
+ You can disable all consistency checking with: \
+ -f [or --force]: do what I say, even if it is stupid \
");
exit(1);
}
@@ -2254,10 +2254,10 @@
static void
activate_usage (char *progn)
{
- printf ("Usage:
- %s device list active partitions on device
- %s device n1 n2 ... activate partitions n1 ..., inactivate the rest
- %s device activate partition n, inactivate the other ones
+ printf ("Usage: \
+ %s device list active partitions on device \
+ %s device n1 n2 ... activate partitions n1 ..., inactivate the rest \
+ %s device activate partition n, inactivate the other ones \
", progn, progn, PROGNAME " -An");
exit (1);
}
Index: tools/fdisk/sfdisk.c
===================================================================
RCS file: /mint/freemint/tools/fdisk/sfdisk.c,v
retrieving revision 1.1
diff -u -r1.1 sfdisk.c
--- tools/fdisk/sfdisk.c 15 Jun 2000 21:25:02 -0000 1.1
+++ tools/fdisk/sfdisk.c 6 Jan 2008 11:35:41 -0000
@@ -2270,10 +2270,10 @@
z->partno = 0;
if (interactive)
- warn("
-Input in the following format; absent fields get a default value.
-<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>
-Usually you only need to specify <start> and <size> (and perhaps <type>).
+ warn(" \
+Input in the following format; absent fields get a default value. \
+<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s> \
+Usually you only need to specify <start> and <size> (and perhaps <type>). \
");
eof = 0;
@@ -2298,47 +2298,47 @@
static void
usage(void) {
version();
- printf("Usage:
- " PROGNAME " [options] device ...
-device: something like /dev/hda or /dev/sda
-useful options:
- -s [or --show-size]: list size of a partition
- -c [or --id]: print or change partition Id
- -l [or --list]: list partitions of each device
- -d [or --dump]: idem, but in a format suitable for later input
- -i [or --increment]: number cylinders etc. from 1 instead of from 0
- -uS, -uB, -uC, -uM: accept/report in units of sectors/blocks/cylinders/MB
- -T [or --list-types]:list the known partition types
- -D [or --DOS]: for DOS-compatibility: waste a little space
- -R [or --re-read]: make kernel reread partition table
- -N# : change only the partition with number #
- -n : do not actually write to disk
- -O file : save the sectors that will be overwritten to file
- -I file : restore these sectors again
- -v [or --version]: print version
- -? [or --help]: print this message
-dangerous options:
- -g [or --show-geometry]: print the kernel's idea of the geometry
- -x [or --show-extended]: also list extended partitions on output
- or expect descriptors for them on input
- -L [or --Linux]: do not complain about things irrelevant for Linux
- -q [or --quiet]: suppress warning messages
- You can override the detected geometry using:
- -C# [or --cylinders #]:set the number of cylinders to use
- -H# [or --heads #]: set the number of heads to use
- -S# [or --sectors #]: set the number of sectors to use
- You can disable all consistency checking with:
- -f [or --force]: do what I say, even if it is stupid
+ printf("Usage: \
+ " PROGNAME " [options] device ... \
+device: something like /dev/hda or /dev/sda \
+useful options: \
+ -s [or --show-size]: list size of a partition \
+ -c [or --id]: print or change partition Id \
+ -l [or --list]: list partitions of each device \
+ -d [or --dump]: idem, but in a format suitable for later input \
+ -i [or --increment]: number cylinders etc. from 1 instead of from 0 \
+ -uS, -uB, -uC, -uM: accept/report in units of sectors/blocks/cylinders/MB \
+ -T [or --list-types]:list the known partition types \
+ -D [or --DOS]: for DOS-compatibility: waste a little space \
+ -R [or --re-read]: make kernel reread partition table \
+ -N# : change only the partition with number # \
+ -n : do not actually write to disk \
+ -O file : save the sectors that will be overwritten to file \
+ -I file : restore these sectors again \
+ -v [or --version]: print version \
+ -? [or --help]: print this message \
+dangerous options: \
+ -g [or --show-geometry]: print the kernel's idea of the geometry \
+ -x [or --show-extended]: also list extended partitions on output \
+ or expect descriptors for them on input \
+ -L [or --Linux]: do not complain about things irrelevant for Linux \
+ -q [or --quiet]: suppress warning messages \
+ You can override the detected geometry using: \
+ -C# [or --cylinders #]:set the number of cylinders to use \
+ -H# [or --heads #]: set the number of heads to use \
+ -S# [or --sectors #]: set the number of sectors to use \
+ You can disable all consistency checking with: \
+ -f [or --force]: do what I say, even if it is stupid \
");
exit(1);
}
static void
activate_usage(char *progn) {
- printf("Usage:
- %s device list active partitions on device
- %s device n1 n2 ... activate partitions n1 ..., inactivate the rest
- %s device activate partition n, inactivate the other ones
+ printf("Usage: \
+ %s device list active partitions on device \
+ %s device n1 n2 ... activate partitions n1 ..., inactivate the rest \
+ %s device activate partition n, inactivate the other ones \
", progn, progn, PROGNAME " -An");
exit(1);
}
@@ -2896,9 +2896,9 @@
if(!no_write && !no_reread) {
warn("Checking that no-one is using this disk right now ... ");
if(reread_ioctl(fd)) {
- printf("
-This disk is currently in use - repartitioning is probably a bad idea.
-Umount all file systems, and swapoff all swap partitions on this disk.
+ printf(" \
+This disk is currently in use - repartitioning is probably a bad idea. \
+Umount all file systems, and swapoff all swap partitions on this disk. \
Use the --no-reread flag to suppress this check.\n");
if (!force) {
printf("Use the --force flag to overrule all checks.\n");
Index: tools/minix/fsck/main.c
===================================================================
RCS file: /mint/freemint/tools/minix/fsck/main.c,v
retrieving revision 1.2
diff -u -r1.2 main.c
--- tools/minix/fsck/main.c 18 Jan 2001 12:48:09 -0000 1.2
+++ tools/minix/fsck/main.c 6 Jan 2008 11:35:41 -0000
@@ -24,18 +24,18 @@
printf ("Filesystem consistency checker. Copyright S.N. Henson 1992,1993,1994.\n");
printf (PROGNAME " version " VERSION " (fnaumann@freemint.de, " DATE ")\n");
- printf ("Usage:
- " PROGNAME " [options] device ...
-device: something like k: or F
-useful options:
- -f : force filesystem check even if it's clean
- -y [or -Y] : answer all questions with 'yes'
- -n [or -N] : don't repair anything, just report errors
- -p : non-interactive mode, only do non-destructive repair
- -d # [or -D #]: use # as directory increment
- -i #,#,#,... : print out pathnames of the # inode list
- -s : print out summary after check
- -S : same as -s but some more infos
+ printf ("Usage: \
+ " PROGNAME " [options] device ... \
+device: something like k: or F \
+useful options: \
+ -f : force filesystem check even if it's clean \
+ -y [or -Y] : answer all questions with 'yes' \
+ -n [or -N] : don't repair anything, just report errors \
+ -p : non-interactive mode, only do non-destructive repair \
+ -d # [or -D #]: use # as directory increment \
+ -i #,#,#,... : print out pathnames of the # inode list \
+ -s : print out summary after check \
+ -S : same as -s but some more infos \
");
exit (1);
Index: tools/toswin2/config.c
===================================================================
RCS file: /mint/freemint/tools/toswin2/config.c,v
retrieving revision 1.13
diff -u -r1.13 config.c
--- tools/toswin2/config.c 13 Jul 2007 21:32:54 -0000 1.13
+++ tools/toswin2/config.c 6 Jan 2008 11:35:41 -0000
@@ -278,12 +278,12 @@
switch (cfg->vt_mode)
{
case MODE_VT52 :
- get_string(popups, TP52, str, sizeof(str));
+ get_string(popups, TP52, str);
new_term = 0;
break;
case MODE_VT100 :
- get_string(popups, TP100, str, sizeof(str));
+ get_string(popups, TP100, str);
new_term = 1;
break;
@@ -293,7 +293,7 @@
}
set_string(cfg_wd->tree, WTERM, str);
- get_string(popups, TPATARI + cfg->char_tab, str, sizeof(str));
+ get_string(popups, TPATARI + cfg->char_tab, str);
set_string(cfg_wd->tree, WTAB, str);
if (cfg->vdi_colors) {
@@ -403,19 +403,19 @@
break;
case WOK :
- get_string(wd->tree, WCOL, str, sizeof(str));
+ get_string(wd->tree, WCOL, str);
cfg->col = atoi(str);
if (cfg->col < MINCOLS)
cfg->col = MINCOLS;
else if (cfg->col > MAXCOLS)
cfg->col = MAXCOLS;
- get_string(wd->tree, WROW, str, sizeof(str));
+ get_string(wd->tree, WROW, str);
cfg->row = atoi(str);
if (cfg->row < MINROWS)
cfg->row = MINROWS;
else if (cfg->row > MAXROWS)
cfg->row = MAXROWS;
- get_string(wd->tree, WBUFFER, str, sizeof(str));
+ get_string(wd->tree, WBUFFER, str);
cfg->scroll = atoi(str);
if (cfg->scroll < 0)
cfg->scroll = 0;
@@ -440,7 +440,7 @@
cfg->kind |= (VSLIDE|UPARROW|DNARROW);
if (get_state(wd->tree, WGSIZER, OS_SELECTED))
cfg->kind |= SIZER;
- get_string(wd->tree, WTITLE, cfg->title, sizeof(cfg->title));
+ get_string(wd->tree, WTITLE, cfg->title);
if (new_term == 0)
cfg->vt_mode = MODE_VT52;
Index: tools/toswin2/event.c
===================================================================
RCS file: /mint/freemint/tools/toswin2/event.c,v
retrieving revision 1.11
diff -u -r1.11 event.c
--- tools/toswin2/event.c 13 Jul 2007 21:32:54 -0000 1.11
+++ tools/toswin2/event.c 6 Jan 2008 11:35:41 -0000
@@ -93,7 +93,7 @@
{
char *p, str[50], s[50];
- get_string(menu, item, s, sizeof(s));
+ get_string(menu, item, s);
/* die fhrenden ' ' berspringen und das letzte auch nicht */
strncpy(str, s + 2, strlen(s) - 3);
Index: tools/toswin2/main.c
===================================================================
RCS file: /mint/freemint/tools/toswin2/main.c,v
retrieving revision 1.14
diff -u -r1.14 main.c
--- tools/toswin2/main.c 13 Jul 2007 21:32:54 -0000 1.14
+++ tools/toswin2/main.c 6 Jan 2008 11:35:41 -0000
@@ -64,7 +64,7 @@
/* Stimmt die RSC-Version? */
rsrc_gaddr(R_TREE, VERSION, &tmp);
- get_string(tmp, RSC_VERSION, str, sizeof(str));
+ get_string(tmp, RSC_VERSION, str);
if (strcmp(str, TWVERSION) != 0)
{
do_alert(1, 0, "[3][Falsche RSC-Version!|Wrong RSC version!][Exit]");
Index: tools/toswin2/proc.c
===================================================================
RCS file: /mint/freemint/tools/toswin2/proc.c,v
retrieving revision 1.10
diff -u -r1.10 proc.c
--- tools/toswin2/proc.c 13 Jul 2007 21:32:54 -0000 1.10
+++ tools/toswin2/proc.c 6 Jan 2008 11:35:41 -0000
@@ -323,7 +323,7 @@
antw = simple_dial(argbox, ARGSTR);
if (antw == ARGOK)
{
- get_string(argbox, ARGSTR, cfg->arg, sizeof(cfg->arg));
+ get_string(argbox, ARGSTR, cfg->arg);
strcat(arg, cfg->arg);
arg[0] = strlen(arg);
env = normal_env(cfg->col, cfg->row, cfg->vt_mode);
Index: tools/toswin2/twterm.c
===================================================================
RCS file: /mint/freemint/tools/toswin2/twterm.c,v
retrieving revision 1.13
diff -u -r1.13 twterm.c
--- tools/toswin2/twterm.c 5 Sep 2005 13:05:41 -0000 1.13
+++ tools/toswin2/twterm.c 6 Jan 2008 11:35:41 -0000
@@ -386,6 +386,8 @@
(X11R6). */
case 1061: /* Set Sun/PC keyboard emulation of
VT220 keyboard. */
+ default:
+ break;
}
count++;
}
Index: xaaes/src.km/vdi_parms.h
===================================================================
RCS file: /mint/freemint/xaaes/src.km/vdi_parms.h,v
retrieving revision 1.1
diff -u -r1.1 vdi_parms.h
--- xaaes/src.km/vdi_parms.h 13 Jul 2007 21:32:54 -0000 1.1
+++ xaaes/src.km/vdi_parms.h 6 Jan 2008 11:35:43 -0000
@@ -27,7 +27,7 @@
#ifndef _vdi_parms_h_
#define _vdi_parms_h_
-#include "gemx.h"
+#include "mt_gemx.h"
struct vdi_xfnt_info_parms
{