From 0071ce8f5b14dc4a802179f9d445307c7d0da932 Mon Sep 17 00:00:00 2001 From: Renaud Fivet Date: Tue, 11 Jun 2013 09:51:29 +0800 Subject: [PATCH] Rebuild on Linux, rollback prototype of ffputline. --- Makefile | 63 ++++++++++++++++++++++++++++---------------------------- fileio.c | 4 ++-- fileio.h | 2 +- 3 files changed, 35 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index b04e40f..c2d1a19 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -# makefile for emacs, updated Mon, Jun 10, 2013 5:55:29 PM +# makefile for emacs, updated Tue Jun 11 09:36:56 CST 2013 -SRC=ansi.c basic.c bind.c bindable.c buffer.c crypt.c display.c ebind.c eval.c exec.c execute.c file.c fileio.c flook.c globals.c ibmpc.c input.c isearch.c line.c lock.c main.c names.c pklock.c posix.c random.c region.c search.c spawn.c tcap.c termio.c utf8.c vmsvt.c vt52.c window.c word.c wrapper.c -OBJ=ansi.o basic.o bind.o bindable.o buffer.o crypt.o display.o ebind.o eval.o exec.o execute.o file.o fileio.o flook.o globals.o ibmpc.o input.o isearch.o line.o lock.o main.o names.o pklock.o posix.o random.o region.o search.o spawn.o tcap.o termio.o utf8.o vmsvt.o vt52.o window.o word.o wrapper.o -HDR=basic.h bind.h bindable.h buffer.h crypt.h display.h ebind.h edef.h efunc.h estruct.h eval.h exec.h execute.h file.h fileio.h flook.h input.h isearch.h line.h lock.h names.h pklock.h random.h region.h search.h spawn.h termio.h utf8.h version.h window.h word.h wrapper.h +SRC=ansi.c basic.c bindable.c bind.c buffer.c crypt.c display.c ebind.c eval.c exec.c execute.c file.c fileio.c flook.c globals.c ibmpc.c input.c isearch.c line.c lock.c main.c names.c pklock.c posix.c random.c region.c search.c spawn.c tcap.c termio.c utf8.c vmsvt.c vt52.c window.c word.c wrapper.c +OBJ=ansi.o basic.o bindable.o bind.o buffer.o crypt.o display.o ebind.o eval.o exec.o execute.o file.o fileio.o flook.o globals.o ibmpc.o input.o isearch.o line.o lock.o main.o names.o pklock.o posix.o random.o region.o search.o spawn.o tcap.o termio.o utf8.o vmsvt.o vt52.o window.o word.o wrapper.o +HDR=basic.h bindable.h bind.h buffer.h crypt.h display.h ebind.h edef.h efunc.h estruct.h eval.h exec.h execute.h file.h fileio.h flook.h input.h isearch.h line.h lock.h names.h pklock.h random.h region.h search.h spawn.h termio.h utf8.h version.h window.h word.h wrapper.h # DO NOT ADD OR MODIFY ANY LINES ABOVE THIS -- make source creates them @@ -125,62 +125,63 @@ depend: ${SRC} ansi.o: ansi.c estruct.h line.h utf8.h edef.h basic.o: basic.c basic.h display.h estruct.h line.h utf8.h edef.h input.h \ - random.h word.h -bind.o: bind.c bind.h edef.h estruct.h line.h utf8.h bindable.h buffer.h \ - display.h ebind.h exec.h file.h flook.h input.h names.h window.h + random.h word.h bindable.o: bindable.c bindable.h buffer.h estruct.h line.h utf8.h \ - display.h edef.h file.h input.h + display.h edef.h file.h input.h +bind.o: bind.c bind.h edef.h estruct.h line.h utf8.h bindable.h buffer.h \ + display.h ebind.h exec.h file.h flook.h input.h names.h window.h buffer.o: buffer.c buffer.h estruct.h line.h utf8.h display.h edef.h \ - file.h input.h window.h + file.h input.h window.h crypt.o: crypt.c crypt.h estruct.h line.h utf8.h display.o: display.c display.h estruct.h line.h utf8.h edef.h termio.h \ - version.h wrapper.h window.h + version.h wrapper.h window.h ebind.o: ebind.c ebind.h basic.h bind.h edef.h estruct.h line.h utf8.h \ - bindable.h buffer.h eval.h exec.h file.h isearch.h random.h region.h \ - search.h spawn.h window.h word.h + bindable.h buffer.h eval.h exec.h file.h isearch.h random.h region.h \ + search.h spawn.h window.h word.h eval.o: eval.c eval.h estruct.h line.h utf8.h basic.h bind.h edef.h \ - buffer.h display.h exec.h flook.h input.h random.h search.h termio.h \ - version.h window.h + buffer.h display.h exec.h flook.h input.h random.h search.h termio.h \ + version.h window.h exec.o: exec.c exec.h estruct.h line.h utf8.h buffer.h bind.h edef.h \ - display.h eval.h file.h flook.h input.h + display.h eval.h file.h flook.h input.h execute.o: execute.c edef.h estruct.h line.h utf8.h bind.h random.h \ - display.h file.h + display.h file.h file.o: file.c file.h buffer.h estruct.h line.h utf8.h crypt.h display.h \ - edef.h execute.h fileio.h input.h lock.h window.h + edef.h execute.h fileio.h input.h lock.h window.h fileio.o: fileio.c fileio.h estruct.h line.h utf8.h display.h crypt.h flook.o: flook.c flook.h estruct.h line.h utf8.h fileio.h globals.o: globals.c estruct.h line.h utf8.h edef.h ibmpc.o: ibmpc.c estruct.h line.h utf8.h edef.h input.o: input.c input.h edef.h estruct.h line.h utf8.h bind.h bindable.h \ - display.h exec.h names.h wrapper.h + display.h exec.h names.h wrapper.h isearch.o: isearch.c isearch.h basic.h display.h estruct.h line.h utf8.h \ - edef.h input.h search.h + edef.h input.h search.h line.o: line.c line.h utf8.h basic.h display.h estruct.h edef.h random.h -lock.o: lock.c lock.h estruct.h line.h utf8.h display.h edef.h input.h +lock.o: lock.c lock.h estruct.h line.h utf8.h display.h edef.h input.h \ + pklock.h main.o: main.c basic.h bind.h edef.h estruct.h line.h utf8.h bindable.h \ - buffer.h display.h eval.h execute.h file.h input.h lock.h random.h \ - search.h termio.h version.h + buffer.h display.h eval.h execute.h file.h input.h lock.h random.h \ + search.h termio.h version.h names.o: names.c names.h basic.h bind.h edef.h estruct.h line.h utf8.h \ - bindable.h buffer.h display.h eval.h exec.h file.h isearch.h region.h \ - random.h search.h spawn.h window.h word.h + bindable.h buffer.h display.h eval.h exec.h file.h isearch.h region.h \ + random.h search.h spawn.h window.h word.h pklock.o: pklock.c pklock.h estruct.h line.h utf8.h edef.h -posix.o: posix.c termio.h +posix.o: posix.c termio.h estruct.h line.h utf8.h edef.h random.o: random.c random.h basic.h display.h estruct.h line.h utf8.h \ - edef.h execute.h input.h search.h + edef.h execute.h input.h search.h region.o: region.c region.h estruct.h line.h utf8.h display.h edef.h search.o: search.c search.h estruct.h line.h utf8.h basic.h display.h \ - edef.h input.h + edef.h input.h spawn.o: spawn.c spawn.h buffer.h estruct.h line.h utf8.h display.h \ - edef.h file.h input.h window.h + edef.h file.h input.h window.h tcap.o: tcap.c display.h estruct.h line.h utf8.h edef.h termio.h -termio.o: termio.c termio.h estruct.h line.h utf8.h edef.h +termio.o: termio.c termio.h utf8.o: utf8.c utf8.h vmsvt.o: vmsvt.c estruct.h line.h utf8.h edef.h vt52.o: vt52.c estruct.h line.h utf8.h edef.h window.o: window.c window.h estruct.h line.h utf8.h basic.h display.h \ - edef.h execute.h wrapper.h + edef.h execute.h wrapper.h word.o: word.c word.h basic.h display.h estruct.h line.h utf8.h edef.h \ - random.h region.h + random.h region.h wrapper.o: wrapper.c wrapper.h # DEPENDENCIES MUST END AT END OF FILE diff --git a/fileio.c b/fileio.c index 7ae3508..4d17a45 100644 --- a/fileio.c +++ b/fileio.c @@ -100,13 +100,13 @@ fio_code ffclose(void) * and the "nbuf" is its length, less the free newline. Return the status. * Check only at the newline. */ -fio_code ffputline( unsigned char *buf, int nbuf, int dosflag) { +fio_code ffputline( char *buf, int nbuf, int dosflag) { #if CRYPT if( is_crypted) { int i ; for( i = 0 ; i < nbuf ; i++) { - unsigned char c ; + char c ; c = buf[ i] ; myencrypt( &c, 1) ; diff --git a/fileio.h b/fileio.h index c6cb436..0d47f47 100644 --- a/fileio.h +++ b/fileio.h @@ -29,7 +29,7 @@ extern int fpayload ; /* actual length of fline content */ fio_code ffclose( void) ; fio_code ffgetline( void) ; -fio_code ffputline( unsigned char *buf, int nbuf, int dosflag) ; +fio_code ffputline( char *buf, int nbuf, int dosflag) ; fio_code ffropen( const char *fn) ; fio_code ffwopen( const char *fn) ;