[commit] r2287 - in trunk/user/console-tools: . src src/contrib src/doc src/lib

[dslinux_sonny_jim at dslinux.in-berlin.de]

Author: dslinux_sonny_jim
Date: Mon Jul 21 17:32:14 2008
New Revision: 2287

Log:
console-tools for DSLinux.  HTML docs and kbdtools disabled due to not building properly.  Consolechars is useful for changing console font size 'on the fly'

Added:
   trunk/user/console-tools/
   trunk/user/console-tools/Makefile
   trunk/user/console-tools/src/
      - copied from r2286, /tags/console-tools/console-tools-0.2.3/
Modified:
   trunk/user/console-tools/src/Makefile.in
   trunk/user/console-tools/src/contrib/codepage.c
   trunk/user/console-tools/src/doc/Makefile.in
   trunk/user/console-tools/src/lib/acm.c
   trunk/user/console-tools/src/lib/fontstruct.c

Modified: trunk/user/console-tools/src/Makefile.in
==============================================================================
--- /tags/console-tools/console-tools-0.2.3/Makefile.in	(original)
+++ trunk/user/console-tools/src/Makefile.in	Mon Jul 21 17:32:14 2008
@@ -113,7 +113,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib doc 	compat include examples po intl
+SUBDIRS = lib fontfiletools vttools screenfonttools contrib doc compat include examples po intl
 
 
 EXTRA_DIST = BUGS RELEASE CREDITS COPYING.kbd local-scripts/* *.lsm

Modified: trunk/user/console-tools/src/contrib/codepage.c
==============================================================================
--- /tags/console-tools/console-tools-0.2.3/contrib/codepage.c	(original)
+++ trunk/user/console-tools/src/contrib/codepage.c	Mon Jul 21 17:32:14 2008
@@ -227,9 +227,7 @@
 	if (optc)
 	  return 0;
 
-        fprintf(stderr, "\
-Warning: CP format is a hack!\n
-         The files produced may or may not be usable!\n");
+        fprintf(stderr, "\Warning: CP format is a hack!\nThe files produced may or may not be usable!\n");
 
 	sprintf(outfile, "%d.cp", CPEntryHeader.codepage);
 	if ((out = fopen(outfile, "w")) == NULL) {

Modified: trunk/user/console-tools/src/doc/Makefile.in
==============================================================================
--- /tags/console-tools/console-tools-0.2.3/doc/Makefile.in	(original)
+++ trunk/user/console-tools/src/doc/Makefile.in	Mon Jul 21 17:32:14 2008
@@ -329,7 +329,7 @@
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-all: lct.txt lct.html kbd.FAQ.txt kbd.FAQ.html
+all: lct.txt kbd.FAQ.txt
 
 %.html: $(srcdir)/%.sgml
 	sgml2html $<

Modified: trunk/user/console-tools/src/lib/acm.c
==============================================================================
--- /tags/console-tools/console-tools-0.2.3/lib/acm.c	(original)
+++ trunk/user/console-tools/src/lib/acm.c	Mon Jul 21 17:32:14 2008
@@ -31,7 +31,7 @@
   int parse_failed = 0;
   int is_unicode;
 
-  if (fstat(fp->_fileno, &stbuf)) 
+  if (fstat(fileno(fp), &stbuf)) 
     perror(_("Cannot stat map file")), exit(1);
 
   /* first try a UTF screen-map: either ASCII (no restriction) or binary (regular file) */

Modified: trunk/user/console-tools/src/lib/fontstruct.c
==============================================================================
--- /tags/console-tools/console-tools-0.2.3/lib/fontstruct.c	(original)
+++ trunk/user/console-tools/src/lib/fontstruct.c	Mon Jul 21 17:32:14 2008
@@ -42,7 +42,7 @@
    */
   
   /* FIXME: should not use _fileno ! */
-  if (fstat(fontfile->_fileno, &stbuf) == -1)
+  if (fstat(fileno(fontfile), &stbuf) == -1)
     goto rsf_return_error;
   
   if (S_ISREG(stbuf.st_mode))