summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile8
-rw-r--r--src/cr_cpri.h132
-rw-r--r--src/cr_doc.txt19
-rw-r--r--src/cr_epri.h52
-rw-r--r--src/cr_gpri.c33
-rw-r--r--src/cr_main.c519
-rw-r--r--src/cr_makefile51
-rwxr-xr-xsrc/hlbin0 -> 15120 bytes
8 files changed, 814 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..223db7d
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,8 @@
+#
+#
+#
+
+hl : cr_main.o cr_gpri.o
+ @ $(CC) -o hl cr_main.o cr_gpri.o
+ @ strip hl
+ -@ ./hl -v || :
diff --git a/src/cr_cpri.h b/src/cr_cpri.h
new file mode 100644
index 0000000..c2999c5
--- /dev/null
+++ b/src/cr_cpri.h
@@ -0,0 +1,132 @@
+/* ============================================================================
+ * Copyright (C) 2015 Martial Bornet
+ *
+ * This program 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 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * (C) Copyright Martial Bornet, 2015.
+ *
+ * Auteur : Martial BORNET (MB) - 3 Janvier 2015
+ *
+ * Description : Constantes privees
+ *
+ * Fichier : cr_cpri.h
+ *
+ * @(#) cr_cpri.h 1.10 15/03/24 MB
+ *
+ * ============================================================================
+ */
+
+#if ! defined(CR_CPRI_H)
+# define CR_CPRI_H
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <regex.h>
+
+#define bool int
+#define FALSE (0)
+#define TRUE (1)
+
+#define CR_NB_COLORS (16)
+
+/* Numeros des couleurs
+ * ~~~~~~~~~~~~~~~~~~~~ */
+#define CR_BLACK (0)
+#define CR_RED (1)
+#define CR_GREEN (2)
+#define CR_YELLOW (3)
+#define CR_BLUE (4)
+#define CR_MAGENTA (5)
+#define CR_CYAN (6)
+#define CR_WHITE (7)
+#define CR_BLACK_REV (8)
+#define CR_RED_REV (9)
+#define CR_GREEN_REV (10)
+#define CR_YELLOW_REV (11)
+#define CR_BLUE_REV (12)
+#define CR_MAGENTA_REV (13)
+#define CR_CYAN_REV (14)
+#define CR_WHITE_REV (15)
+
+#define CR_C0 "black"
+#define CR_C1 "red"
+#define CR_C2 "green"
+#define CR_C3 "yellow"
+#define CR_C4 "blue"
+#define CR_C5 "magenta"
+#define CR_C6 "cyan"
+#define CR_C7 "white"
+#define CR_C8 "black reverse"
+#define CR_C9 "red reverse"
+#define CR_C10 "green reverse"
+#define CR_C11 "yellow reverse"
+#define CR_C12 "blue reverse"
+#define CR_C13 "magenta reverse"
+#define CR_C14 "cyan reverse"
+#define CR_C15 "white reverse"
+
+#define CR_INIT_COL(n) { G.color_RE[CR_COLOR_IDX(n)].col_name = CR_C ## n; \
+ G.color_RE[CR_COLOR_IDX(n)].col_num = (n % 8); }
+
+/* Indice de tableau d'une couleur
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#define CR_COLOR_IDX(color) ((color))
+
+#if 0
+/* Code des couleurs pour Linux ANSI
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#define CR_CODE_LINUX(color) ((color) % 8) + 30)
+#endif
+
+/* Taille d'une ligne, nombre d'intervalles differents
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#define CR_SIZE (1024)
+
+struct cr_RE {
+ regex_t reg;
+ char *regex;
+ int cflags;
+};
+
+struct cr_color {
+ bool used;
+ char *col_name;
+ int col_num;
+ struct cr_RE RE;
+ int linux_code;
+ FILE *out;
+};
+
+struct cr_col_desc {
+ bool used;
+ struct cr_color *col;
+};
+
+struct cr_global {
+ char *prgname;
+
+ struct cr_color color_RE[CR_NB_COLORS];
+ struct cr_color *curr_col;
+ int cflags;
+ int list[CR_NB_COLORS];
+ int idx_list;
+ char line[CR_SIZE + 1];
+ struct cr_col_desc desc[CR_SIZE + 1];
+ int length;
+ bool debug;
+ bool disp_regex;
+ FILE *out;
+};
+
+#endif /* CR_CPRI_H */
diff --git a/src/cr_doc.txt b/src/cr_doc.txt
new file mode 100644
index 0000000..4cb99b8
--- /dev/null
+++ b/src/cr_doc.txt
@@ -0,0 +1,19 @@
+#
+# @(#) [MB] cr_doc.txt Version 1.1 du 14/12/29 -
+#
+
+Syntaxe :
+ colorize -rgbycmw expr ...
+ -r : colorize in red
+ -g : colorize in green
+ -b : colorize in blue
+ -y : colorize in yellow
+ -c : colorize in cyan
+ -m : colorize in magenta
+ -w : colorize in high white
+
+ expr :
+ text
+ ^.*text.*$
+ text\P : colorize until the end of the paragraph
+ (until next empty line of EOF)
diff --git a/src/cr_epri.h b/src/cr_epri.h
new file mode 100644
index 0000000..eee4a52
--- /dev/null
+++ b/src/cr_epri.h
@@ -0,0 +1,52 @@
+/* ============================================================================
+ * Copyright (C) 2015 Martial Bornet
+ *
+ * This program 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 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * (C) Copyright Martial Bornet, 2015.
+ *
+ * Auteur : Martial BORNET (MB) - 3 Janvier 2015
+ *
+ * Description : Externes privees
+ *
+ * Fichier : cr_epri.h
+ *
+ * @(#) cr_epri.h 1.8 15/03/24 MB
+ *
+ * ============================================================================
+ */
+
+#if ! defined(CR_EPRI_H)
+# define CR_EPRI_H
+
+#include "cr_cpri.h"
+
+extern struct cr_global G;
+
+/* Fonctions
+ * ~~~~~~~~~ */
+void cr_usage(void);
+void cr_init_list(void);
+void cr_init_col_names(void);
+void cr_set_color(int, char *);
+void cr_free_RE(void);
+void cr_read_input(void);
+void cr_disp_color(int, char *);
+void cr_start_color(struct cr_color *, int);
+void cr_end_color(struct cr_color *);
+void cr_init_desc(void);
+void cr_set_desc(struct cr_color *, int, int, int);
+void cr_disp_line(void);
+
+#endif /* CR_EPRI_H */
diff --git a/src/cr_gpri.c b/src/cr_gpri.c
new file mode 100644
index 0000000..c68691d
--- /dev/null
+++ b/src/cr_gpri.c
@@ -0,0 +1,33 @@
+/* ============================================================================
+ * Copyright (C) 2015 Martial Bornet
+ *
+ * This program 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 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * (C) Copyright Martial Bornet, 2015.
+ *
+ * Auteur : Martial BORNET (MB) - 3 Janvier 2015
+ *
+ * Description : Globales privees
+ *
+ * Fichier : cr_gpri.c
+ *
+ * @(#) cr_gpri.c 1.4 15/03/24 MB
+ *
+ * ============================================================================
+ */
+
+#include "cr_epri.h"
+
+struct cr_global G = { 0 };
+
diff --git a/src/cr_main.c b/src/cr_main.c
new file mode 100644
index 0000000..7ef83a5
--- /dev/null
+++ b/src/cr_main.c
@@ -0,0 +1,519 @@
+/* ============================================================================
+ * Copyright (C) 2015 Martial Bornet
+ *
+ * This program 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 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Auteur : Martial BORNET (MB) - 3 Janvier 2015
+ *
+ * Description : Programme de colorisation de chaines
+ *
+ * Fichier : cr_main.c
+ *
+ * @(#) cr_main.c 1.22 15/03/24 MB
+ *
+ * Liste des fonctions de ce fichier :
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * - main
+ * - cr_usage
+ * - cr_init_list
+ * - cr_init_col_names
+ * - cr_set_color
+ * - cr_read_input
+ * - cr_start_color
+ * - cr_end_color
+ * - cr_init_desc
+ * - cr_set_desc
+ * - cr_disp_line
+ * ============================================================================
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <string.h>
+
+#include "cr_epri.h"
+
+#define X fprintf(stderr, "%s(%d)\n", __FILE__, __LINE__);
+
+/******************************************************************************
+
+ MAIN
+
+******************************************************************************/
+int main(int argc, char *argv[])
+{
+ int _opt, _i;
+ struct cr_color *_col;
+
+ G.prgname = argv[0];
+ G.out = stdout;
+
+ if (argc == 1) {
+ cr_usage();
+ }
+
+ cr_init_list();
+ cr_init_col_names();
+
+ /* Analyse des arguments
+ ~~~~~~~~~~~~~~~~~~~~~ */
+ while ((_opt = getopt(argc, argv, "huvEr:g:y:b:m:c:w:R:G:Y:B:M:C:W:Ddei")) != -1) {
+ switch (_opt) {
+ case 'h':
+ cr_usage();
+ break;
+
+ case 'E':
+ G.out = stderr;
+ break;
+
+ case 'd' :
+ G.debug = TRUE;
+ break;
+
+ case 'D' :
+ G.disp_regex = TRUE;
+ break;
+
+ case 'r':
+ cr_set_color(CR_RED, optarg);
+ break;
+
+ case 'g':
+ cr_set_color(CR_GREEN, optarg);
+ break;
+
+ case 'y':
+ cr_set_color(CR_YELLOW, optarg);
+ break;
+
+ case 'b':
+ cr_set_color(CR_BLUE, optarg);
+ break;
+
+ case 'm':
+ cr_set_color(CR_MAGENTA, optarg);
+ break;
+
+ case 'c':
+ cr_set_color(CR_CYAN, optarg);
+ break;
+
+ case 'w':
+ cr_set_color(CR_WHITE, optarg);
+ break;
+
+ case 'R':
+ cr_set_color(CR_RED_REV, optarg);
+ break;
+
+ case 'G':
+ cr_set_color(CR_GREEN_REV, optarg);
+ break;
+
+ case 'Y':
+ cr_set_color(CR_YELLOW_REV, optarg);
+ break;
+
+ case 'B':
+ cr_set_color(CR_BLUE_REV, optarg);
+ break;
+
+ case 'M':
+ cr_set_color(CR_MAGENTA_REV, optarg);
+ break;
+
+ case 'C':
+ cr_set_color(CR_CYAN_REV, optarg);
+ break;
+
+ case 'W':
+ cr_set_color(CR_WHITE_REV, optarg);
+ break;
+
+ case 'e':
+ G.cflags |= REG_EXTENDED;
+ break;
+
+ case 'i':
+ G.cflags |= REG_ICASE;
+ break;
+
+ case 'u':
+ setvbuf(stdout, (char *) 0, _IONBF, 0);
+ break;
+
+ case 'v':
+ fprintf(stderr, "%s: version %s\n", G.prgname, "1.22");
+ exit(1);
+ break;
+
+ default:
+ fprintf(stderr, "%s: unknown option '%c' !\n", G.prgname, _opt);
+ cr_usage();
+ break;
+ }
+ }
+// G.cflags |= REG_NEWLINE;
+
+ if (G.disp_regex) {
+ for (_i = 0; _i < G.idx_list; _i++) {
+ _col = &G.color_RE[G.list[_i]];
+ printf("[%2d] ", _i + 1);
+ cr_start_color(NULL, _col->col_num);
+ printf("%s\n", _col->RE.regex);
+ cr_end_color(NULL);
+ }
+ }
+
+ cr_read_input();
+
+ cr_free_RE();
+ return 0;
+}
+
+/******************************************************************************
+
+ CR_USAGE
+
+******************************************************************************/
+void cr_usage(void)
+{
+ fprintf(stderr, "%s: version %s\n", G.prgname, "1.22");
+ fprintf(stderr, "Usage: %s [-h|-eidD][-E][-rgybmcwRGYBMCW] regexp ...\n", G.prgname);
+ fprintf(stderr, " -h : help\n");
+ fprintf(stderr, " -v : version\n");
+ fprintf(stderr, " -u : do not bufferize output on stdout\n");
+ fprintf(stderr, " -e : extended regular expressions\n");
+ fprintf(stderr, " -i : ignore case\n");
+ fprintf(stderr, " -E : print on stderr\n");
+ fprintf(stderr, " -r : red\n");
+ fprintf(stderr, " -g : green\n");
+ fprintf(stderr, " -y : yellow\n");
+ fprintf(stderr, " -b : blue\n");
+ fprintf(stderr, " -m : magenta\n");
+ fprintf(stderr, " -c : cyan\n");
+ fprintf(stderr, " -w : white\n");
+ fprintf(stderr, " -R : red (reverse video)\n");
+ fprintf(stderr, " -G : green (reverse video)\n");
+ fprintf(stderr, " -Y : yellow (reverse video)\n");
+ fprintf(stderr, " -B : blue (reverse video)\n");
+ fprintf(stderr, " -M : magenta (reverse video)\n");
+ fprintf(stderr, " -C : cyan (reverse video)\n");
+ fprintf(stderr, " -W : white (reverse video)\n");
+ fprintf(stderr, " -d : debug\n");
+ fprintf(stderr, " -D : display regular expressions\n");
+ exit(1);
+}
+
+/******************************************************************************
+
+ CR_INIT_LIST
+
+******************************************************************************/
+void cr_init_list(void)
+{
+ int _i;
+
+ for (_i = 0; _i < CR_NB_COLORS; _i++) {
+ G.list[_i] = -1;
+ }
+ G.idx_list = 0;
+}
+
+/******************************************************************************
+
+ CR_INIT_COL_NAMES
+
+******************************************************************************/
+void cr_init_col_names(void)
+{
+ CR_INIT_COL(0);
+ CR_INIT_COL(1);
+ CR_INIT_COL(2);
+ CR_INIT_COL(3);
+ CR_INIT_COL(4);
+ CR_INIT_COL(5);
+ CR_INIT_COL(6);
+ CR_INIT_COL(7);
+ CR_INIT_COL(8);
+ CR_INIT_COL(9);
+ CR_INIT_COL(10);
+ CR_INIT_COL(11);
+ CR_INIT_COL(12);
+ CR_INIT_COL(13);
+ CR_INIT_COL(14);
+ CR_INIT_COL(15);
+}
+
+/******************************************************************************
+
+ CR_SET_COLOR
+
+******************************************************************************/
+void cr_set_color(int color, char *regexp)
+{
+ int _idx;
+ struct cr_color *_col;
+
+ _idx = CR_COLOR_IDX(color);
+
+ _col = &G.color_RE[_idx];
+
+ if (_col->used) {
+ /* Couleur deja specifiee
+ ~~~~~~~~~~~~~~~~~~~~~~ */
+ fprintf(stderr, "%s: duplicated color (%s)\n", G.prgname, _col->col_name);
+ exit(1);
+ }
+ G.list[G.idx_list++] = _idx;
+
+ _col->used = TRUE;
+ _col->col_num = color;
+ _col->RE.cflags = G.cflags;
+ _col->RE.regex = regexp;
+ _col->out = G.out;
+ G.out = stdout;
+
+ if (regcomp(&_col->RE.reg, regexp, _col->RE.cflags) != 0) {
+ fprintf(stderr, "%s: regcomp error for \"%s\" !\n", G.prgname, regexp);
+ exit(1);
+ }
+}
+
+/******************************************************************************
+
+ CR_FREE_RE
+
+******************************************************************************/
+void cr_free_RE(void)
+{
+ int _i;
+ regex_t *_reg;
+
+ for (_i = 0; _i < CR_NB_COLORS; _i++) {
+ _reg = &G.color_RE[_i].RE.reg;
+ if (_reg) {
+ regfree(_reg);
+ }
+ }
+}
+/******************************************************************************
+
+ CR_READ_INPUT
+
+******************************************************************************/
+void cr_read_input(void)
+{
+ int _i, _j, _n, _s = 0, _e = 0, _off;
+ struct cr_color *_col;
+ size_t _nmatch;
+ regmatch_t _pmatch[CR_SIZE + 1];
+ int _eflags = 0;
+
+ char _debug_str[CR_SIZE + 1];
+
+ _nmatch = sizeof(_pmatch) / sizeof(_pmatch[0]);
+
+ for (_n = sizeof(G.line); fgets(G.line, _n, stdin) != 0; _n = sizeof(G.line)) {
+ /* Reinitialisation des descripteurs de couleurs
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ cr_init_desc();
+
+ G.length = strlen(G.line);
+
+ for (_i = 0; _i < G.idx_list; _i++) {
+ _col = &G.color_RE[G.list[_i]];
+
+ for (_off = 0; regexec(&_col->RE.reg, G.line + _off, _nmatch, _pmatch, _eflags) == 0; _off += _e + 1) {
+ if (G.debug) {
+ fprintf(stderr, "LINE : [%s] :\n", G.line + _off);
+ }
+
+ for (_j = 0; _pmatch[_j].rm_so != -1; _j++) {
+ _s = _pmatch[_j].rm_so;
+ _e = _pmatch[_j].rm_eo - 1;
+
+ if (G.debug) {
+ strncpy(_debug_str, G.line + _off + _s, _e - _s + 1);
+ _debug_str[_e -_s + 1] = 0;
+ fprintf(stderr, "OFFSET = %3d : %3d => %3d [%s] [%s]\n", _off, _s, _e, _col->RE.regex, _debug_str);
+ }
+
+ cr_set_desc(_col, _off, _s, _e);
+ }
+
+ /* Pour traiter les chaines vides
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ if (_e < 0) {
+ fprintf(stderr, "%s: warning : empty match !\n", G.prgname);
+ exit(1);
+// break;
+ }
+ }
+ }
+
+ cr_disp_line();
+ }
+
+ exit(1);
+}
+
+/******************************************************************************
+
+ CR_START_COLOR
+
+******************************************************************************/
+void cr_start_color(struct cr_color *col, int color)
+{
+ FILE *_out;
+
+ if (col) _out = col->out;
+ else _out = stdout;
+
+ if (color > CR_WHITE) {
+ /* Reverse video
+ ~~~~~~~~~~~~~ */
+ fprintf(_out, "\033[01;30m\033[01;%dm", 40 + (color - 8));
+ }
+ else {
+ /* Normal video
+ ~~~~~~~~~~~~ */
+ fprintf(_out, "\033[01;%dm", 30 + color);
+ }
+}
+
+/******************************************************************************
+
+ CR_END_COLOR
+
+******************************************************************************/
+void cr_end_color(struct cr_color *col)
+{
+ FILE *_out;
+
+ if (col) _out = col->out;
+ else _out = stdout;
+
+ fprintf(_out, "\033[0m");
+}
+
+/******************************************************************************
+
+ CR_INIT_DESC
+
+******************************************************************************/
+void cr_init_desc(void)
+{
+ struct cr_col_desc *_desc;
+
+ G.length = 0;
+
+ for (_desc = G.desc; _desc < (&G.desc[sizeof(G.desc) / sizeof(G.desc[0])]); _desc++) {
+ _desc->col = NULL;
+ _desc->used = FALSE;
+ }
+}
+
+/******************************************************************************
+
+ CR_SET_DESC
+
+******************************************************************************/
+void cr_set_desc(struct cr_color *col, int offset, int s, int e)
+{
+ int _i;
+ struct cr_col_desc *_desc;
+
+ for (_i = s, _desc = &G.desc[offset + s]; _i <= e; _i++, _desc++) {
+ if (!_desc->used) {
+ _desc->used = TRUE;
+ _desc->col = col;
+ }
+ }
+}
+
+/******************************************************************************
+
+ CR_DISP_LINE
+
+******************************************************************************/
+void cr_disp_line(void)
+{
+ int _i;
+ struct cr_col_desc *_desc;
+
+ for (_i = 0, _desc = G.desc; _i < G.length; _i++, _desc++) {
+ if (G.line[_i] == '\n') {
+ if (G.curr_col) {
+ cr_end_color(G.curr_col);
+ putc(G.line[_i], G.curr_col->out);
+ }
+ else {
+ putc(G.line[_i], stdout);
+ }
+ }
+ else if (_desc->used) {
+ /* Le caractere est en couleur
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ if (G.curr_col == NULL) {
+ /* Le caractere precedent n'etait pas en couleur
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ cr_start_color(_desc->col, _desc->col->col_num);
+ putc(G.line[_i], _desc->col->out);
+ }
+ else {
+ /* Le caractere precedent etait en couleur
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ if (_desc-> col == G.curr_col) {
+ /* Pas de changement de couleur
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ putc(G.line[_i], G.curr_col->out);
+ }
+ else {
+ /* Changement de couleur
+ ~~~~~~~~~~~~~~~~~~~~~ */
+ cr_end_color(G.curr_col);
+ cr_start_color(_desc->col, _desc->col->col_num);
+ putc(G.line[_i], _desc->col->out);
+ }
+ }
+ }
+ else {
+ /* Le caractere n'est pas en couleur
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ if (G.curr_col == NULL) {
+ /* Le caractere precedent n'etait pas en couleur
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ putc(G.line[_i], stdout);
+ }
+ else {
+ /* Le caractere precedent etait en couleur
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ cr_end_color(G.curr_col);
+ putc(G.line[_i], G.curr_col->out);
+ }
+ }
+ G.curr_col = _desc->col;
+ if (G.line[_i] == '\n') {
+ G.curr_col = NULL;
+ }
+ }
+ _desc--;
+ if (_desc->used) {
+ cr_end_color(G.curr_col);
+ }
+}
diff --git a/src/cr_makefile b/src/cr_makefile
new file mode 100644
index 0000000..74893af
--- /dev/null
+++ b/src/cr_makefile
@@ -0,0 +1,51 @@
+# ============================================================================
+# Copyright (C) 2015 Martial Bornet
+#
+# This program 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 of the License, or
+# (at your option) any later version.
+#
+# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Fichier makefile du module CR
+# =============================
+# MKMF Version 2.7 (alpha 1)
+#
+# %Z% [%Y%] %M% Version %I% du %E% - %Q%
+#
+# ============================================================================
+
+include ../makelib1
+
+# Objets issus de sources "C"
+# ===========================
+#
+OBJ_C = $(LIB)(cr_gpri.o) \
+ $(LIB)(cr_main.o)
+
+# Liste de tous les objets de la bibliotheque
+# ===========================================
+#
+OBJ_LIB= $(OBJ_C)
+
+# Regles de production de la bibliotheque de modules objets
+# =========================================================
+#
+
+include ../makelib2
+
+# Liste des dependances des fichiers objets
+# =========================================
+#
+
+$(LIB)(cr_gpri.o): cr_epri.h
+
+$(LIB)(cr_main.o): cr_epri.h
diff --git a/src/hl b/src/hl
new file mode 100755
index 0000000..34d250b
--- /dev/null
+++ b/src/hl
Binary files differ
generated by cgit v1.1 at 2025-05-17 21:31:18 +0000