diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-09-28 11:23:09 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-09-28 11:32:04 +0300 |
commit | ac1d6cbbcf5323d5db59886b98a24c45bafa64b8 (patch) | |
tree | f2a77092e072faa680b47d9d6d960e7214e46876 /etc/flncat.c | |
parent | d902742081bc31a6eda274268da0178107e4abb4 (diff) | |
download | eclat-ac1d6cbbcf5323d5db59886b98a24c45bafa64b8.tar.gz eclat-ac1d6cbbcf5323d5db59886b98a24c45bafa64b8.tar.bz2 |
Improve testsuite. Reorganize directory structure.
* Makefile.am (SUBDIRS): Add etc
(distuninstallcheck_listfiles): Ignore *.forlan files.
* configure.ac: New options --split-format and --format-dir
* etc/Makefile.am: New file.
* etc/default.fln: New file.
* etc/describe-instance-status.fln: New file.
* etc/describe-instances.fln: New file.
* etc/describe-tags.fln: New file.
* etc/eclat.cfin: New file.
* etc/flncat.c: New file.
* etc/start-instances.fln: New file.
* etc/stop-instances.fln: New file.
* src/Makefile.am: Remove eclat.conf. It is built in /etc now.
* src/eclat.conf: Remove.
* src/cmdline.opt: Update.
* src/config.c: New configuration statement "format-file".
* src/eclat.c (format_file_option): New global.
(main): Read format from format-file, if supplied. Expand
keywords in its argument.
* src/eclat.h (format_file_option): New extern.
* tests/.gitignore: Update.
* tests/Makefile.am: Add new files.
* tests/describe-instance-status.at: New test case.
* tests/describe-instances.at: New test case.
* tests/describe-tags.at: New test case.
* tests/dscrinststat.at: New test case.
* tests/start-instances.at: New test case.
* tests/stop-instances.at: New test case.
* tests/testsuite.at (ECLAT_TEST_FORMAT): New macro.
Include new test cases.
* tests/trws.c: New file.
Diffstat (limited to 'etc/flncat.c')
-rw-r--r-- | etc/flncat.c | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/etc/flncat.c b/etc/flncat.c new file mode 100644 index 0000000..6f67e0e --- /dev/null +++ b/etc/flncat.c @@ -0,0 +1,94 @@ +/* This file is part of Eclat. + Copyright (C) 2012 Sergey Poznyakoff. + + Eclat is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + Eclat is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Eclat. If not, see <http://www.gnu.org/licenses/>. */ + +#include <stdio.h> +#include <ctype.h> +#include <assert.h> + +int +comment(FILE *fp, int c) +{ + if (c != '/') { + ungetc(c, fp); + return 0; + } + + if ((c = getc(fp)) == '/') { + while ((c = getc(fp)) != EOF && c != '\n') + ; + return 1; + } + + if (c == '*') { + do { + while ((c = getc(fp)) != '*') { + if (c == EOF) + return 0; + } + } while ((c = getc(fp)) != '/'); + return 1; + } + ungetc(c, fp); + ungetc('/', fp); + return 0; +} + +int +main(int argc, char **argv) +{ + int i; + FILE *fp; + int c; + char buf[128]; + size_t lev = 0; + + for (i = 1; i < argc; i++) { + fp = fopen(*++argv, "r"); + if (!fp) { + perror(*argv); + return 1; + } + + if (i > 1) { + /* Skip whitespace and comment lines */ + do { + while ((c = fgetc(fp)) != EOF && isspace(c)) + ; + } while (c != EOF && comment(fp, c)); + printf(" else "); + } + + while ((c = fgetc(fp)) != EOF) { + putchar(c); + if (c == '}') { + lev = 0; + while ((c = fgetc(fp)) != EOF && + isspace(c)) { + assert(lev < sizeof(buf)); + buf[lev++] = c; + } + if (c == EOF) + break; + else { + buf[lev++] = c; + fwrite(buf, lev, 1, stdout); + } + } + } + fclose(fp); + } + return 0; +} |