From b5884b3fd633a968051fc3f1574733eea13b0230 Mon Sep 17 00:00:00 2001 From: Mateusz Hromada Date: Tue, 9 Jun 2009 20:50:22 +0200 Subject: [PATCH] Migration to new build system. * rs12 moved and checked --- app/src/rs12/Makefile | 15 ---------- app/src/rs12/rs12.c | 48 ------------------------------- auto/output/Makefile | 7 ++++- src/rs12.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 64 deletions(-) delete mode 100644 app/src/rs12/Makefile delete mode 100644 app/src/rs12/rs12.c create mode 100644 src/rs12.c diff --git a/app/src/rs12/Makefile b/app/src/rs12/Makefile deleted file mode 100644 index 0be6e3a..0000000 --- a/app/src/rs12/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -PAR = -m32 -# -static - -main: rs12 - -rs12: rs12.c - gcc $(PAR) -o rs12 rs12.c - -clean: - rm rs12 - -copy: -ifdef UTT_BIN_DIR - cp rs12 ${UTT_BIN_DIR} -endif diff --git a/app/src/rs12/rs12.c b/app/src/rs12/rs12.c deleted file mode 100644 index 6d051b7..0000000 --- a/app/src/rs12/rs12.c +++ /dev/null @@ -1,48 +0,0 @@ -#include -#include - -#define MAXLINE 1000 - -main() -{ - char buf[MAXLINE+1], outbuf[MAXLINE+1]; - char form[MAXLINE+1]; - int len; - int curpos,nextpos=0; - int a,b; - while(fgets(buf,MAXLINE,stdin)) - { - int n=sscanf(buf,"%d %d",&a,&b); - if(n==2) - { - nextpos=a+b; - fputs(buf,stdout); - } - else - { - if(n==1) - { - curpos=a; - sscanf(buf,"%*d %*s %s",form); - } - else - { - curpos=nextpos; - sscanf(buf,"%*s %s",form); - } - - if(*form == '*') - len=0; - else - { - char *f = form; - for(len=0; *f; ++f) if(*f != '\\') ++len; - } - - char *buf1=buf; while(!isalpha(*buf1)) ++buf1; - sprintf(outbuf,"%04i %02i %s", curpos, len, buf1); - fputs(outbuf,stdout); - nextpos = curpos+len; - } - } -} diff --git a/auto/output/Makefile b/auto/output/Makefile index 4ecf585..c0ef933 100755 --- a/auto/output/Makefile +++ b/auto/output/Makefile @@ -45,7 +45,7 @@ ALL_FFLAGS = -t \$(FFLAGS) VPATH = ./src -PROGRAMS = tok sen fla gph kot unfla grp mar ser kon rm12 +PROGRAMS = tok sen fla gph kot unfla grp mar ser kon rm12 rs12 TOK_OBJ_FILES = tok.o tok_cmdline.o TOK_FLEX_FILES = tok.l @@ -92,6 +92,10 @@ kon: \$(KON_PERL_FILES) RM12_SED_FILES = rm12.sed rm12: \$(RM12_SED_FILES) +RS12_OBJ_FILES = rs12.o +rs12: \$(RS12_OBJ_FILES) +rs12.o: rs12.c + CONFIG_FILES = src/config.h Makefile .SUFFIXES: @@ -126,6 +130,7 @@ clean: \$(RM) \$(SEN_OBJ_FILES) \$(RM) \$(patsubst %.l,%.c,\$(SEN_FLEX_FILES)) \$(RM) \$(FLA_OBJ_FILES) + \$(RM) \$(RS12_OBJ_FILES) .PHONY: distclean distclean: clean diff --git a/src/rs12.c b/src/rs12.c new file mode 100644 index 0000000..cbed10e --- /dev/null +++ b/src/rs12.c @@ -0,0 +1,66 @@ +#include +#include +#include + +#define MAXLINE 1000 + +int main() +{ + char buf[MAXLINE]; + char outbuf[MAXLINE]; + char form[MAXLINE]; + int len; + int curpos; + int nextpos=0; + int a; + int b; + + while( fgets(buf, MAXLINE, stdin) ) + { + int n = sscanf(buf, "%d %d", &a, &b); + if( 2 == n ) + { + nextpos = a + b; + fputs(buf, stdout); + } + else + { + if( 1 == n ) + { + curpos = a; + sscanf(buf, "%*d %*s %s", form); + } + else + { + curpos = nextpos; + sscanf(buf, "%*s %s", form); + } + + if( '*' == *form ) + { + len = 0; + } + else + { + char *f = form; + for( len = 0; *f; ++f ) + { + if( '\\' != *f) + { + ++len; + } + } + } + + char *buf1 = buf; + while( !isalpha(*buf1) ) + { + ++buf1; + } + sprintf(outbuf, "%04i %02i %s", curpos, len, buf1); + fputs(outbuf, stdout); + nextpos = curpos + len; + } + } + return 0; +}