diff options
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | articles.c | 2 | ||||
| -rw-r--r-- | captcha.h | 1 | ||||
| -rw-r--r-- | debug.h | 4 | ||||
| -rw-r--r-- | libterm/examples/Makefile | 8 | ||||
| -rw-r--r-- | libterm/examples/detect_resize.c | 63 | ||||
| -rw-r--r-- | libterm/examples/detect_screen_size.c | 39 | ||||
| -rw-r--r-- | libterm/examples/filtered_input.c | 63 | ||||
| -rw-r--r-- | libterm/examples/invisible_input.c | 67 | ||||
| -rw-r--r-- | libterm/examples/restore_screen.c | 24 | ||||
| -rw-r--r-- | libterm/term.c | 114 | ||||
| -rw-r--r-- | libterm/term.h | 8 | ||||
| -rw-r--r-- | logs.c | 58 | ||||
| -rw-r--r-- | logs.h | 6 | ||||
| -rw-r--r-- | microbbs.c | 13 | ||||
| -rw-r--r-- | sds/LICENSE | 24 | ||||
| -rw-r--r-- | sds/README.md | 875 | ||||
| -rw-r--r-- | todo.c | 9 | ||||
| -rw-r--r-- | todo/todo.txt | 5 |
19 files changed, 1344 insertions, 45 deletions
@@ -1,2 +1,8 @@ *.o microbbs +todo/todo +todo/todo.txt +mconf +users/users +article/*.txt +kconf2h/kconf2h
\ No newline at end of file @@ -28,7 +28,7 @@ int bbs_article( term_screen *ts, const char *fname ) max_y = 24; } - bbs_log_article( fname ); + bbs_log_article( NULL ); if ( fname != NULL ) { @@ -5,6 +5,7 @@ #include <stdlib.h> #include "kconfig.h" +#include "logs.h" //ask question if you are bot or no. In 99% cases should protect from random //bots. @@ -61,5 +61,9 @@ PRINT_FILE_F PRINT_LINE_F format E_COLOR_E, PRINT_FILE_D, \ PRINT_LINE_D, ##args); +#define PNL() PRINT("\n"); + +#define ENL() ERROR("\n"); + #endif diff --git a/libterm/examples/Makefile b/libterm/examples/Makefile new file mode 100644 index 0000000..64009bd --- /dev/null +++ b/libterm/examples/Makefile @@ -0,0 +1,8 @@ +CC=gcc + +make: + $(CC) detect_screen_size.c -o detect_screen_size ../libterm.o -I../ + $(CC) detect_resize.c -o detect_resize ../libterm.o -I../ + $(CC) filtered_input.c -o filtered_input ../libterm.o -I../ + $(CC) invisible_input.c -o invisisble_input ../libterm.o -I../ + $(CC) restore_screen.c -o restore_screen ../libterm.o -I../
\ No newline at end of file diff --git a/libterm/examples/detect_resize.c b/libterm/examples/detect_resize.c new file mode 100644 index 0000000..27c88c6 --- /dev/null +++ b/libterm/examples/detect_resize.c @@ -0,0 +1,63 @@ +#include <stdio.h> +#include <stdlib.h> + +#include <term.h> + +int main() +{ + int c; + int max_r, max_c; + + struct term_screen ts; memset( &ts, 0, sizeof(ts) ); + + if ( term_init( &ts ) == -1 ) + printf("Some err when init\n"); + + term_clr_scr( &ts ); + + { + char buf[32]; + int c; + c = term_get_maxcol( &ts ); + snprintf( buf, 32, "MaxCol:%d\n", c ); + write( ts.ofd, buf, strlen(buf) ); + } + + { + char buf[32]; + int r; + r = term_get_maxrow( &ts ); + snprintf( buf, 32, "MaxRow:%d\n", r ); + write( ts.ofd, buf, strlen(buf) ); + } + + while ( (c = getchar() ) != 'q' ) + { + term_clr_scr( &ts ); + + { + char buf[32]; + max_c = term_get_maxcol( &ts ); + snprintf( buf, 32, "MaxCol:%d\n", max_c ); + write( ts.ofd, buf, strlen(buf) ); + } + + { + char buf[32]; + max_r = term_get_maxrow( &ts ); + snprintf( buf, 32, "MaxRow:%d\n", max_r ); + write( ts.ofd, buf, strlen(buf) ); + } + { + term_cur_set_r( &ts, max_r ); + term_cur_set_c( &ts, max_c ); + printf("+"); + } + } + + term_clr_scr( &ts ); + + term_set_orig_mode( &ts ); + + return 0; +}
\ No newline at end of file diff --git a/libterm/examples/detect_screen_size.c b/libterm/examples/detect_screen_size.c new file mode 100644 index 0000000..f309253 --- /dev/null +++ b/libterm/examples/detect_screen_size.c @@ -0,0 +1,39 @@ +#include <stdio.h> +#include <stdlib.h> + +#include <term.h> + +int main() +{ + struct term_screen ts; memset( &ts, 0, sizeof(ts) ); + + if ( term_init( &ts ) == -1 ) + printf("Some err when init\n"); + + term_clr_scr( &ts ); + + { + char buf[32]; + int c; + c = term_get_maxcol( &ts ); + snprintf( buf, 32, "MaxCol:%d\n", c ); + write( ts.ofd, buf, strlen(buf) ); + } + + { + char buf[32]; + int r; + r = term_get_maxrow( &ts ); + snprintf( buf, 32, "MaxRow:%d\n", r ); + write( ts.ofd, buf, strlen(buf) ); + } + + + sleep(3); + + term_clr_scr( &ts ); + + term_set_orig_mode( &ts ); + + return 0; +}
\ No newline at end of file diff --git a/libterm/examples/filtered_input.c b/libterm/examples/filtered_input.c new file mode 100644 index 0000000..170e474 --- /dev/null +++ b/libterm/examples/filtered_input.c @@ -0,0 +1,63 @@ +#include <stdio.h> +#include <stdlib.h> + +#include <term.h> + +int main() +{ + int c; + int new_c=0, new_r=0, old_r=0, old_c=0; + const int in_size = 32; + int counter=0; + char in_buf[in_size]; + + struct term_screen ts; memset( &ts, 0, sizeof(ts) ); + + if ( term_init( &ts ) == -1 ) + printf("Some err when init\n"); + + term_clr_scr( &ts ); + + new_c = term_get_maxcol( &ts ); + new_r = term_get_maxrow( &ts ); + old_r = new_r; + old_c = new_c; + + memset( in_buf, 0, in_size ); + + term_cur_set_c( &ts, 0); + term_cur_set_r( &ts, old_r); + printf("Your name is?: %s", in_buf); + while ( (c = getchar() ) != 13 ) + { + if ( isalpha(c) ) + { + if ( counter < in_size-1 ) + { + in_buf[counter] = c; + counter++; + } + } else if ( c == 127 ) + { + if ( counter > 0) + { + in_buf[counter-1] = 0x0; + counter--; + } + } else + printf("%d",c); + term_clr_scr( &ts ); + new_r = term_get_maxrow( &ts ); + if ( old_r != new_r ) old_r = new_r; + term_cur_set_c( &ts, 0); + term_cur_set_r( &ts, old_r); + printf("Your name is?: %s", in_buf); + + } + + term_clr_scr( &ts ); + + term_set_orig_mode( &ts ); + + return 0; +}
\ No newline at end of file diff --git a/libterm/examples/invisible_input.c b/libterm/examples/invisible_input.c new file mode 100644 index 0000000..5fadfb3 --- /dev/null +++ b/libterm/examples/invisible_input.c @@ -0,0 +1,67 @@ +#include <stdio.h> +#include <stdlib.h> + +#include <term.h> + +int main() +{ + int c; + int new_c=0, new_r=0, old_r=0, old_c=0; + const int in_size = 32; + int counter=0; + int i=0; + char in_buf[in_size]; + + struct term_screen ts; memset( &ts, 0, sizeof(ts) ); + + if ( term_init( &ts ) == -1 ) + printf("Some err when init\n"); + + term_clr_scr( &ts ); + + new_c = term_get_maxcol( &ts ); + new_r = term_get_maxrow( &ts ); + old_r = new_r; + old_c = new_c; + + memset( in_buf, 0, in_size ); + + term_cur_set_c( &ts, 0); + term_cur_set_r( &ts, old_r); + printf("Your name is?: %s", in_buf); + while ( (c = getchar() ) != 13 ) + { + if ( isalpha(c) ) + { + if ( counter < in_size-1 ) + { + in_buf[counter] = c; + counter++; + } + } else if ( c == 127 ) + { + if ( counter > 0) + { + in_buf[counter-1] = 0x0; + counter--; + } + } else + printf("%d",c); + term_clr_scr( &ts ); + new_r = term_get_maxrow( &ts ); + if ( old_r != new_r ) old_r = new_r; + term_cur_set_c( &ts, 0); + term_cur_set_r( &ts, old_r); + printf("Your name is?: "); + for ( i=0; i<counter;i++) printf("*"); + + } + + term_clr_scr( &ts ); + + term_set_orig_mode( &ts ); + + printf("Hidden input was: %s\n", in_buf ); + + return 0; +}
\ No newline at end of file diff --git a/libterm/examples/restore_screen.c b/libterm/examples/restore_screen.c new file mode 100644 index 0000000..5323d78 --- /dev/null +++ b/libterm/examples/restore_screen.c @@ -0,0 +1,24 @@ +#include <stdio.h> +#include <stdlib.h> + +#include <term.h> +#include <debug.h> + +int main() +{ + struct term_screen ts; memset( &ts, 0, sizeof(ts) ); + + + PRINT("asd\n"); + if ( term_init( &ts ) == -1 ) + printf("Some err when init\n"); + PRINT("asd\n"); + + printf("set mode\n"); + + sleep(1); + + term_set_orig_mode( &ts ); + + return 0; +}
\ No newline at end of file diff --git a/libterm/term.c b/libterm/term.c index 9a4e231..1aa7afa 100644 --- a/libterm/term.c +++ b/libterm/term.c @@ -26,26 +26,33 @@ enum KEY_ACTION{ #define T_ESC "\x1b" +//setup initial terminal stuff +//this coulc act differently, becouse allways there is +//different terminal setting that should be default int term_init( term_screen *term ) { int ret=0; - if ( !isatty(STDIN_FILENO) ) goto exit_error; + memset( term, 0, sizeof( term_screen )); + + if ( !isatty(STDIN_FILENO) ) + { + ERROR("isatty failed\n") + goto exit_error; + } //!!!!!! //register atexit term->ifd = STDIN_FILENO; term->ofd = STDOUT_FILENO; - if (term_set_raw_mode( term ) == -1 ) goto exit_error; + //if you whant raw mode then you should set it man + if ( tcgetattr( term->ifd, &term->orig_i ) == -1 ) goto exit_error; + term->raw_i = term->orig_i; - term->term_col = term_get_maxcol( term );//not good - if (term->term_col == -1) ret = -1; + //if (term_set_raw_mode( term ) == -1 ) goto exit_error; - term->term_row = term_get_maxrow( term );//not good - if (term->term_row == -1) ret = -1; - - term->mode = SCREEN_MODE_80x24; + term->mode = SCREEN_MODE_80x24; return ret; @@ -54,7 +61,9 @@ exit_error: return -1; } - +//get maximal number of columns setting up cursor to 999 column +//and getting on with place terminal have placed cursor and getting +//column on with terminal putted cursor int term_get_maxcol( term_screen *ts ) { int ret=-1; @@ -87,7 +96,8 @@ exit_error: } - +//try to setup far away line after that read position where +//terminal have putted cursor and read line of that postion int term_get_maxrow( term_screen *ts ) { int ret=-1; @@ -123,6 +133,8 @@ exit_error: return -1; } + + int term_cur_pos( term_screen *ts ) { int ret=-1; @@ -182,16 +194,56 @@ exit_error: return -1; } - -int term_cur_set_c( term_screen *ts ) +//set cursor column position +int term_cur_set_c( term_screen *ts, unsigned int pc ) { + int ret = 0; + int cur_r; -} + /* go to right marging and get position */ + if ( (cur_r = term_cur_pos_r( ts )) == -1 ) + goto exit_error; + /* set position */ + { + char buf[32]; + int l; + + snprintf( buf, 32, T_ESC "[%d;%dH", cur_r, pc); + l = strlen( buf ); + if ( write( ts->ofd, buf, l ) != l) + goto exit_error; + } + + return ret; +exit_error: + return -1; +} -int term_cur_set_r( term_screen *ts ) +//set cursor row/line position +int term_cur_set_r( term_screen *ts, unsigned int pr ) { + int ret = 0; + int cur_c; + + /* go to right marging and get position */ + if ( (cur_c = term_cur_pos_c( ts )) == -1 ) + goto exit_error; + /* set position */ + { + char buf[32]; + int l; + + snprintf( buf, 32, T_ESC "[%d;%dH", pr, cur_c); + l = strlen( buf ); + if ( write( ts->ofd, buf, l ) != l) + goto exit_error; + } + + return ret; +exit_error: + return -1; } int term_set_speed( term_screen *ts ) @@ -200,6 +252,8 @@ int term_set_speed( term_screen *ts ) return ret; } + +//clean terminal with escape command int term_clr_scr( term_screen *ts ) { int ret = 0; @@ -209,33 +263,39 @@ int term_clr_scr( term_screen *ts ) return ret; } - +//set terminal default input/output behavior int term_set_raw_mode( term_screen *ts ) { int ret = 0; - if ( tcgetattr( ts->ifd, &ts->orig ) == -1 ) goto exit_error; - + if ( tcgetattr( ts->ifd, &ts->orig_i ) == -1 ) + { + ERROR("Cannot get input terminal attributes\n"); + goto exit_error; + } - ts->raw = ts->orig; /* modify the original mode */ + ts->raw_i = ts->orig_i; /* modify the original mode */ /* input modes: no break, no CR to NL, no parity check, no strip char, * no start/stop output control. */ - ts->raw.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); + ts->raw_i.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); /* output modes - disable post raw */ - ts->raw.c_oflag &= ~(OPOST); + ts->raw_i.c_oflag &= ~(OPOST); /* control modes - set 8 bit chars */ - ts->raw.c_cflag |= (CS8); + ts->raw_i.c_cflag |= (CS8); /* local modes - choing off, canonical off, no extended functions, * no signal chars (^Z,^C) */ - ts->raw.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG); + ts->raw_i.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG); /* control chars - set return condition: min number of bytes and timer. * We want read to return every single byte, without timeout. */ - ts->raw.c_cc[VMIN] = 1; - ts->raw.c_cc[VTIME] = 0; /* 1 byte, no timer */ + ts->raw_i.c_cc[VMIN] = 1; + ts->raw_i.c_cc[VTIME] = 0; /* 1 byte, no timer */ /* put terminal in raw mode after flushing */ - if (tcsetattr( ts->ifd, TCSAFLUSH, &ts->raw) < 0) goto exit_error; - + if (tcsetattr( ts->ifd, TCSAFLUSH, &ts->raw_i) < 0) + { + ERROR("Cannot set new terminal input attribures\n"); + goto exit_error; + } return ret; @@ -249,5 +309,5 @@ exit_error: void term_set_orig_mode( term_screen *ts ) { - tcsetattr( ts->ifd, TCSAFLUSH, &ts->orig ); + tcsetattr( ts->ifd, TCSAFLUSH, &ts->orig_i ); }
\ No newline at end of file diff --git a/libterm/term.h b/libterm/term.h index 010ed1b..b290a43 100644 --- a/libterm/term.h +++ b/libterm/term.h @@ -19,8 +19,8 @@ typedef struct term_screen { int ifd, ofd; - struct termios orig; - struct termios raw; + struct termios orig_i, orig_o; + struct termios raw_i, raw_o; screen_mode_e mode; int term_col, term_row; } term_screen; @@ -31,8 +31,8 @@ int term_get_maxrow( term_screen* ); int term_cur_pos( term_screen* ); int term_cur_pos_c( term_screen* ); int term_cur_pos_r( term_screen* ); -int term_cur_set_c( term_screen* ); -int term_cur_set_r( term_screen* ); +int term_cur_set_c( term_screen*, unsigned int ); +int term_cur_set_r( term_screen*, unsigned int ); int term_set_speed( term_screen* ); int term_clr_scr( term_screen* ); int term_set_raw_mode( term_screen* ); @@ -1,9 +1,10 @@ #include "logs.h" -int bbs_log( const char *syslname ) +int bbs_log_main( const char *syslname ) { int ret=0; char *term=NULL; + pid_t pid; setlogmask (LOG_UPTO (LOG_NOTICE)); @@ -17,10 +18,12 @@ int bbs_log( const char *syslname ) //maybe fake visitor term = getenv( "TERM" ); + pid = getpid(); + //why it gives warning on %z? that why just typecast and hope if ( term != NULL ) - syslog (LOG_NOTICE, "BBS visitor with TERM=%s", term); + syslog (LOG_NOTICE, "BBS visitor with TERM=%s pid=%d", term, (int)pid); else - syslog( LOG_NOTICE, "BBS visitor" ); + syslog( LOG_NOTICE, "BBS visitor pid=%d", (int)pid ); closelog (); @@ -75,6 +78,30 @@ int bbs_log_article_list( const char *syslname ) } +int bbs_log_captcha( const char *syslname ) +{ + int ret=0; + + setlogmask (LOG_UPTO (LOG_NOTICE)); + + if ( syslname == NULL ) + { + openlog ( BBS_DEFAULT_SYSLOG, LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1); + } else + { + openlog ( syslname, LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1 ); + } + + //probably not fake visitor + syslog( LOG_NOTICE, "captcha passed" ); + + closelog (); + + + return ret; +} + + int bbs_log_motd( const char *syslname ) { int ret=0; @@ -100,6 +127,7 @@ int bbs_log_motd( const char *syslname ) int bbs_log_quit( const char *syslname ) { int ret=0; + pid_t pid; setlogmask (LOG_UPTO (LOG_NOTICE)); @@ -111,7 +139,9 @@ int bbs_log_quit( const char *syslname ) openlog ( syslname, LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1 ); } - syslog( LOG_NOTICE, "BBS quit" ); + pid = getpid(); + //why it gives warning on %z? that why just typecast and hope + syslog( LOG_NOTICE, "BBS quit pid=%d", (int)pid ); closelog (); @@ -119,4 +149,24 @@ int bbs_log_quit( const char *syslname ) return ret; } +int bbs_log( const char *syslname, const char *s ) +{ + int ret=0; + + setlogmask (LOG_UPTO (LOG_NOTICE)); + + if ( syslname == NULL ) + { + openlog ( BBS_DEFAULT_SYSLOG, LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1); + } else + { + openlog ( syslname, LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1 ); + } + + syslog( LOG_NOTICE, "BBS: %s", s ); + + closelog (); + + return ret; +} @@ -7,9 +7,13 @@ #define BBS_DEFAULT_SYSLOG "microbbs" -int bbs_log( const char* ); +int bbs_log_main( const char* ); int bbs_log_article( const char* ); int bbs_log_article_list( const char* ); +int bbs_log_captcha( const char* ); int bbs_log_motd( const char* ); int bbs_log_quit( const char* ); + +int bbs_log( const char*, const char* ); + #endif @@ -17,18 +17,20 @@ int main( int argc, char **argv ) term_screen ts; term_init( &ts ); + term_clr_scr( &ts ); //lunch captcha and try to detect if its random bot #ifdef CONFIG_CAPTCHA if ( captcha_test1() != 1) return 1; + bbs_log_captcha( NULL ); #endif //write to log that some user have accesed bbs //too much fake stuff comes to log - //bbs_log( NULL ); //write to default place + bbs_log_main( NULL ); //write to default place #ifdef CONFIG_MOTD - bbs_login_motd( &ts, "art/motd.txt" ); + bbs_login_motd( NULL, "art/motd.txt" ); print_build_info(); #endif @@ -81,6 +83,8 @@ int main( int argc, char **argv ) } break; #endif + + //------------------------------------------------------------------ case 's': case 'S': { @@ -118,6 +122,7 @@ int main( int argc, char **argv ) break; #endif + //------------------------------------------------------------------ #ifndef CONFIG_MESSAGING case 'g': case 'G': @@ -159,6 +164,7 @@ int main( int argc, char **argv ) break; #endif + //------------------------------------------------------------------ case 'q': case 'Q': bbs_log_quit( NULL ); @@ -171,5 +177,8 @@ int main( int argc, char **argv ) #ifdef CONFIG_MOTD bbs_quit_motd( &ts, "art/quit.txt" ); #endif + + term_clr_scr( &ts ); + term_set_orig_mode( &ts ); return 0; } diff --git a/sds/LICENSE b/sds/LICENSE new file mode 100644 index 0000000..d1199bc --- /dev/null +++ b/sds/LICENSE @@ -0,0 +1,24 @@ +Copyright (c) 2006-2014, Salvatore Sanfilippo <antirez at gmail dot com> + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/sds/README.md b/sds/README.md new file mode 100644 index 0000000..a2fd4db --- /dev/null +++ b/sds/README.md @@ -0,0 +1,875 @@ +Simple Dynamic Strings +=== + +SDS is a string library for C designed to augment the limited libc string +handling functionalities by adding heap allocated strings that are: + +* Simpler to use. +* Binary safe. +* Computationally more efficient. +* But yet... Compatible with normal C string functions. + +This is achieved using an alternative design in which instead of using a C +structure to represent a string, we use a binary prefix that is stored +before the actual pointer to the string that is returned by SDS to the user. + + +--------+-------------------------------+-----------+ + | Header | Binary safe C alike string... | Null term | + +--------+-------------------------------+-----------+ + | + `-> Pointer returned to the user. + +Because of meta data stored before the actual returned pointer as a prefix, +and because of every SDS string implicitly adding a null term at the end of +the string regardless of the actual content of the string, SDS strings work +well together with C strings and the user is free to use them interchangeably +with real-only functions that access the string in read-only. + +SDS was a C string I developed in the past for my everyday C programming needs, +later it was moved into Redis where it is used extensively and where it was +modified in order to be suitable for high performance operations. Now it was +extracted from Redis and forked as a stand alone project. + +Because of its many years life inside Redis, SDS provides both higher level +functions for easy strings manipulation in C, but also a set of low level +functions that make it possible to write high performance code without paying +a penalty for using an higher level string library. + +Advantages and disadvantages of SDS +=== + +Normally dynamic string libraries for C are implemented using a structure +that defines the string. The structure has a pointer field that is managed +by the string function, so it looks like this: + +```c +struct yourAverageStringLibrary { + char *buf; + size_t len; + ... possibly more fields here ... +}; +``` + +SDS strings are already mentioned don't follow this schema, and are instead +a single allocation with a prefix that lives *before* the address actually +returned for the string. + +There are advantages and disadvantages with this approach over the traditional +approach: + +**Disadvantage #1**: many functions return the new string as value, since sometimes SDS requires to create a new string with more space, so the most SDS API calls look like this: + +```c +s = sdscat(s,"Some more data"); +``` + +As you can see `s` is used as input for `sdscat` but is also set to the value +returned by the SDS API call, since we are not sure if the call modified the +SDS string we passed or allocated a new one. Not remembering to assign back +the return value of `sdscat` or similar functions to the variable holding +the SDS string will result in a bug. + +**Disadvantage #2**: if an SDS string is shared in different places in your program you have to modify all the references when you modify the string. However most of the times when you need to share SDS strings it is much better to encapsulate them into structures with a `reference count` otherwise it is too easy to incur into memory leaks. + +**Advantage #1**: you can pass SDS strings to functions designed for C functions without accessing a struct member or calling a function, like this: + +```c +printf("%s\n", sds_string); +``` + +In most other libraries this will be something like: + +```c +printf("%s\n", string->buf); +``` + +Or: + +```c +printf("%s\n", getStringPointer(string)); +``` + +**Advantage #2**: accessing individual chars is straightforward. C is a low level language so this is an important operation in many programs. With SDS strings accessing individual chars is very natural: + +```c +printf("%c %c\n", s[0], s[1]); +``` + +With other libraries your best chance is to assign `string->buf` (or call the function to get the string pointer) to a `char` pointer and work with this. However since the other libraries may reallocate the buffer implicitly every time you call a function that may modify the string you have to get a reference to the buffer again. + +**Advantage #3**: single allocation has better cache locality. Usually when you access a string created by a string library using a structure, you have two different allocations for the structure representing the string, and the actual buffer holding the string. Over the time the buffer is reallocated, and it is likely that it ends in a totally different part of memory compared to the structure itself. Since modern programs performances are often dominated by cache misses, SDS may perform better in many workloads. + +SDS basics +=== + +The type of SDS strings is just the char pointer `char *`. However SDS defines +an `sds` type as alias of `char *` in its header file: you should use the +`sds` type in order to make sure you remember that a given variable in your +program holds an SDS string and not a C string, however this is not mandatory. + +This is the simplest SDS program you can write that does something: + +```c +sds mystring = sdsnew("Hello World!"); +printf("%s\n", mystring); +sdsfree(mystring); + +output> Hello World! +``` + +The above small program already shows a few important things about SDS: + +* SDS strings are created, and heap allocated, via the `sdsnew()` function, or other similar functions that we'll see in a moment. +* SDS strings can be passed to `printf()` like any other C string. +* SDS strings require to be freed with `sdsfree()`, since they are heap allocated. + +Creating SDS strings +--- + +```c +sds sdsnewlen(const void *init, size_t initlen); +sds sdsnew(const char *init); +sds sdsempty(void); +sds sdsdup(const sds s); +``` + +There are many ways to create SDS strings: + +* The `sdsnew` function creates an SDS string starting from a C null terminated string. We already saw how it works in the above example. +* The `sdsnewlen` function is similar to `sdsnew` but instead of creating the string assuming that the input string is null terminated, it gets an additional length parameter. This way you can create a string using binary data: + + ```c + char buf[3]; + sds mystring; + + buf[0] = 'A'; + buf[1] = 'B'; + buf[2] = 'C'; + mystring = sdsnewlen(buf,3); + printf("%s of len %d\n", mystring, (int) sdslen(mystring)); + + output> ABC of len 3 + ``` + + Note: `sdslen` return value is casted to `int` because it returns a `size_t` +type. You can use the right `printf` specifier instead of casting. + +* The `sdsempty()` function creates an empty zero-length string: + + ```c + sds mystring = sdsempty(); + printf("%d\n", (int) sdslen(mystring)); + + output> 0 + ``` + +* The `sdsdup()` function duplicates an already existing SDS string: + + ```c + sds s1, s2; + + s1 = sdsnew("Hello"); + s2 = sdsdup(s1); + printf("%s %s\n", s1, s2); + + output> Hello Hello + ``` + +Obtaining the string length +--- + +```c +size_t sdslen(const sds s); +``` + +In the examples above we already used the `sdslen` function in order to get +the length of the string. This function works like `strlen` of the libc +except that: + +* It runs in constant time since the length is stored in the prefix of SDS strings, so calling `sdslen` is not expensive even when called with very large strings. +* The function is binary safe like any other SDS string function, so the length is the true length of the string regardless of the content, there is no problem if the string includes null term characters in the middle. + +As an example of the binary safeness of SDS strings, we can run the following +code: + +```c +sds s = sdsnewlen("A\0\0B",4); +printf("%d\n", (int) sdslen(s)); + +output> 4 +``` + +Note that SDS strings are always null terminated at the end, so even in that +case `s[4]` will be a null term, however printing the string with `printf` +would result in just `"A"` to be printed since libc will treat the SDS string +like a normal C string. + +Destroying strings +--- + +```c +void sdsfree(sds s); +``` + +The destroy an SDS string there is just to call `sdsfree` with the string +pointer. However note that empty strings created with `sdsempty` need to be +destroyed as well otherwise they'll result into a memory leak. + +The function `sdsfree` does not perform any operation if instead of an SDS +string pointer, `NULL` is passed, so you don't need to check for `NULL` explicitly before calling it: + +```c +if (string) sdsfree(string); /* Not needed. */ +sdsfree(string); /* Same effect but simpler. */ +``` + +Concatenating strings +--- + +Concatenating strings to other strings is likely the operation you will end +using the most with a dynamic C string library. SDS provides different +functions to concatenate strings to existing strings. + +```c +sds sdscatlen(sds s, const void *t, size_t len); +sds sdscat(sds s, const char *t); +``` + +The main string concatenation functions are `sdscatlen` and `sdscat` that are +identical, the only difference being that `sdscat` does not have an explicit +length argument since it expects a null terminated string. + +```c +sds s = sdsempty(); +s = sdscat(s, "Hello "); +s = sdscat(s, "World!"); +printf("%s\n", s); + +output> Hello World! +``` + +Sometimes you want to cat an SDS string to another SDS string, so you don't +need to specify the length, but at the same time the string does not need to +be null terminated but can contain any binary data. For this there is a +special function: + +```c +sds sdscatsds(sds s, const sds t); +``` + +Usage is straightforward: + +```c +sds s1 = sdsnew("aaa"); +sds s2 = sdsnew("bbb"); +s1 = sdscatsds(s1,s2); +sdsfree(s2); +printf("%s\n", s1); + +output> aaabbb +``` + +Sometimes you don't want to append any special data to the string, but you want +to make sure that there are at least a given number of bytes composing the +whole string. + +```c +sds sdsgrowzero(sds s, size_t len); +``` + +The `sdsgrowzero` function will do nothing if the current string length is +already `len` bytes, otherwise it will enlarge the string to `len` just padding +it with zero bytes. + +```c +sds s = sdsnew("Hello"); +s = sdsgrowzero(s,6); +s[5] = '!'; /* We are sure this is safe because of sdsgrowzero() */ +printf("%s\n', s); + +output> Hello! +``` + +Formatting strings +--- + +There is a special string concatenation function that accepts a `printf` alike +format specifier and cats the formatted string to the specified string. + +```c +sds sdscatprintf(sds s, const char *fmt, ...) { +``` + +Example: + +```c +sds s; +int a = 10, b = 20; +s = sdsnew("The sum is: "); +s = sdscatprintf(s,"%d+%d = %d",a,b,a+b); +``` + +Often you need to create SDS string directly from `printf` format specifiers. +Because `sdscatprintf` is actually a function that concatenates strings all +you need is to concatenate your string to an empty string: + + +```c +char *name = "Anna"; +int loc = 2500; +sds s; +s = sdscatprintf(sdsempty(), "%s wrote %d lines of LISP\n", name, loc); +``` + +You can use `sdscatprintf` in order to convert numbers into SDS strings: + +```c +int some_integer = 100; +sds num = sdscatprintf(sdsempty(),"%d\n", some_integer); +``` + +However this is slow and we have a special function to make it efficient. + +Fast number to string operations +--- + +Creating an SDS string from an integer may be a common operation in certain +kind of programs, and while you may do this with `sdscatprintf` the performance +hit is big, so SDS provides a specialized function. + +```c +sds sdsfromlonglong(long long value); +``` + +Use it like this: + +```c +sds s = sdsfromlonglong(10000); +printf("%d\n", (int) sdslen(s)); + +output> 5 +``` + +Trimming strings and getting ranges +--- + +String trimming is a common operation where a set of characters are +removed from the left and the right of the string. Another useful operation +regarding strings is the ability to just take a range out of a larger +string. + +```c +void sdstrim(sds s, const char *cset); +void sdsrange(sds s, int start, int end); +``` + +SDS provides both the operations with the `sdstrim` and `sdsrange` functions. +However note that both functions work differently than most functions modifying +SDS strings since the return value is null: basically those functions always +destructively modify the passed SDS string, never allocating a new one, because +both trimming and ranges will never need more room: the operations can only +remove characters from the original strings. + +Because of this behavior, both functions are fast and don't involve reallocation. + +This is an example of string trimming where newlines and spaces are removed +from an SDS strings: + +```c +sds s = sdsnew(" my string\n\n "); +sdstrim(s," \n"); +printf("-%s-\n",s); + +output> -my string- +``` + +Basically `sdstrim` takes the SDS string to trim as first argument, and a +null terminated set of characters to remove from left and right of the string. +The characters are removed as long as they are not interrupted by a character +that is not in the list of characters to trim: this is why the space between +`"my"` and `"string"` was preserved in the above example. + +Taking ranges is similar, but instead to take a set of characters, it takes +to indexes, representing the start and the end as specified by zero-based +indexes inside the string, to obtain the range that will be retained. + +```c +sds s = sdsnew("Hello World!"); +sdsrange(s,1,4); +printf("-%s-\n"); + +output> -ello- +``` + +Indexes can be negative to specify a position starting from the end of the +string, so that `-1` means the last character, `-2` the penultimate, and so forth: + +```c +sds s = sdsnew("Hello World!"); +sdsrange(s,6,-1); +printf("-%s-\n"); +sdsrange(s,0,-2); +printf("-%s-\n"); + +output> -World!- +output> -World- +``` + +`sdsrange` is very useful when implementing networking servers processing +a protocol or sending messages. For example the following code is used +implementing the write handler of the Redis Cluster message bus between +nodes: + +```c +void clusterWriteHandler(..., int fd, void *privdata, ...) { + clusterLink *link = (clusterLink*) privdata; + ssize_t nwritten = write(fd, link->sndbuf, sdslen(link->sndbuf)); + if (nwritten <= 0) { + /* Error handling... */ + } + sdsrange(link->sndbuf,nwritten,-1); + ... more code here ... +} +``` + +Every time the socket of the node we want to send the message to is writable +we attempt to write as much bytes as possible, and we use `sdsrange` in order +to remove from the buffer what was already sent. + +The function to queue new messages to send to some node in the cluster will +simply use `sdscatlen` in order to put more data in the send buffer. + +Note that the Redis Cluster bus implements a binary protocol, but since SDS +is binary safe this is not a problem, so the goal of SDS is not just to provide +an high level string API for the C programmer but also dynamically allocated +buffers that are easy to manage. + +String copying +--- + +The most dangerous and infamus function of the standard C library is probably +`strcpy`, so perhaps it is funny how in the context of better designed dynamic +string libraries the concept of copying strings is almost irrelevant. Usually +what you do is to create strings with the content you want, or concatenating +more content as needed. + +However SDS features a string copy function that is useful in performance +critical code sections, however I guess its practical usefulness is limited +as the function never managed to get called in the context of the 50k +lines of code composing the Redis code base. + +```c +sds sdscpylen(sds s, const char *t, size_t len); +sds sdscpy(sds s, const char *t); +``` + +The string copy function of SDS is called `sdscpylen` and works like that: + +```c +s = sdsnew("Hello World!"); +s = sdscpylen(s,"Hello Superman!",15); +``` + +As you can see the function receives as input the SDS string `s`, but also +returns an SDS string. This is common to many SDS functions that modify the +string: this way the returned SDS string may be the original one modified +or a newly allocated one (for example if there was not enough room in the +old SDS string). + +The `sdscpylen` will simply replace what was in the old SDS string with the +new data you pass using the pointer and length argument. There is a similar +function called `sdscpy` that does not need a length but expects a null +terminated string instead. + +You may wonder why it makes sense to have a string copy function in the +SDS library, since you can simply create a new SDS string from scratch +with the new value instead of copying the value in an existing SDS string. +The reason is efficiency: `sdsnewlen` will always allocate a new string +while `sdscpylen` will try to reuse the existing string if there is enough +room to old the new content specified by the user, and will allocate a new +one only if needed. + +Quoting strings +--- + +In order to provide consistent output to the program user, or for debugging +purposes, it is often important to turn a string that may contain binary +data or special characters into a quoted string. Here for quoted string +we mean the common format for String literals in programming source code. +However today this format is also part of the well known serialization formats +like JSON and CSV, so it definitely escaped the simple gaol of representing +literals strings in the source code of programs. + +An example of quoted string literal is the following: + +```c +"\x00Hello World\n" +``` + +The first byte is a zero byte while the last byte is a newline, so there are +two non alphanumerical characters inside the string. + +SDS uses a concatenation function for this goal, that concatenates to an +existing string the quoted string representation of the input string. + +```c +sds sdscatrepr(sds s, const char *p, size_t len); +``` + +The `scscatrepr` (where `repr` means *representation*) follows the usualy +SDS string function rules accepting a char pointer and a length, so you can +use it with SDS strings, normal C strings by using strlen() as `len` argument, +or binary data. The following is an example usage: + +```c +sds s1 = sdsnew("abcd"); +sds s2 = sdsempty(); +s[1] = 1; +s[2] = 2; +s[3] = '\n'; +s2 = sdscatrepr(s2,s1,sdslen(s1)); +printf("%s\n", s2); + +output> "a\x01\x02\n" +``` + +This is the rules `sdscatrepr` uses for conversion: + +* `\` and `"` are quoted with a backslash. +* It quotes special characters `'\n'`, `'\r'`, `'\t'`, `'\a'` and `'\b'`. +* All the other non printable characters not passing the `isprint` test are quoted in `\x..` form, that is: backslash followed by `x` followed by two digit hex number representing the character byte value. +* The function always adds initial and final double quotes characters. + +There is an SDS function that is able to perform the reverse conversion and is +documented in the *Tokenization* paragraph below. + +Tokenization +--- + +Tokenization is the process of splitting a larger string into smaller strings. +In this specific case, the split is performed specifying another string that +acts as separator. For example in the following string there are two substrings +that are separated by the `|-|` separator: + +``` +foo|-|bar|-|zap +``` + +A more common separator that consists of a single character is the comma: + +``` +foo,bar,zap +``` + +In many progrems it is useful to process a line in order to obtain the sub +strings it is composed of, so SDS provides a function that returns an +array of SDS strings given a string and a separator. + +```c +sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count); +void sdsfreesplitres(sds *tokens, int count); +``` + +As usually the function can work with both SDS strings or normal C strings. +The first two arguments `s` and `len` specify the string to tokenize, and the +other two arguments `sep` and `seplen` the separator to use during the +tokenization. The final argument `count` is a pointer to an integer that will +be set to the number of tokens (sub strings) returned. + +The return value is a heap allocated array of SDS strings. + +```c +sds *tokens; +int count, j; + +sds line = sdsnew("Hello World!"); +tokens = sdssplitlen(line,sdslen(line)," ",1,&count); + +for (j = 0; j < count; j++) + printf("%s\n", tokens[j]); +sdsfreesplitres(tokens,count); + +output> Hello +output> World! +``` + +The returned array is heap allocated, and the single elements of the array +are normal SDS strings. You can free everything calling `sdsfreesplitres` +as in the example. Alternativey you are free to release the array yourself +using the `free` function and use and/or free the individual SDS strings +as usually. + +A valid approach is to set the array elements you reused in some way to +`NULL`, and use `sdsfreesplitres` to free all the rest. + +Command line oriented tokenization +--- + +Splitting by a separator is a useful operation, but usually it is not enough +to perform one of the most common tasks involving some non trivial string +manipulation, that is, implementing a **Command Line Interface** for a program. + +This is why SDS also provides an additional function that allows you to split +arguments provided by the user via the keyboard in an interactive manner, or +via a file, network, or any other mean, into tokens. + +```c +sds *sdssplitargs(const char *line, int *argc); +``` + +The `sdssplitargs` function returns an array of SDS strings exactly like +`sdssplitlen`. The function to free the result is also identical, and is +`sdsfreesplitres`. The difference is in the way the tokenization is performed. + +For example if the input is the following line: + +``` +call "Sabrina" and "Mark Smith\n" +``` + +The function will return the following tokens: + +* "call" +* "Sabrina" +* "and" +* "Mark Smith\n" + +Basically different tokens need to be separated by one or more spaces, and +every single token can also be a quoted string in the same format that +`sdscatrepr` is able to emit. + +String joining +--- + +There are two functions doing the reverse of tokenization by joining strings +into a single one. + +```c +sds sdsjoin(char **argv, int argc, char *sep, size_t seplen); +sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen); +``` + +The two functions take as input an array of strings of length `argc` and +a separator and its length, and produce as output an SDS string consisting +of all the specified strings separated by the specified separator. + +The difference between `sdsjoin` and `sdsjoinsds` is that the former accept +C null terminated strings as input while the latter requires all the strings +in the array to be SDS strings. However because of this only `sdsjoinsds` is +able to deal with binary data. + +```c +char *tokens[3] = {"foo","bar","zap"}; +sds s = sdsjoin(tokens,3,"|",1); +printf("%s\n", s); + +output> foo|bar|zap +``` + +Error handling +--- + +All the SDS functions that return an SDS pointer may also return `NULL` on +out of memory, this is basically the only check you need to perform. + +However many modern C programs handle out of memory simply aborting the program +so you may want to do this as well by wrapping `malloc` and other related +memory allocation calls directly. + +SDS internals and advanced usage +=== + +At the very beginning of this documentation it was explained how SDS strings +are allocated, however the prefix stored before the pointer returned to the +user was classified as an *header* without further details. For an advanced +usage it is better to dig more into the internals of SDS and show the +structure implementing it: + +```c +struct sdshdr { + int len; + int free; + char buf[]; +}; +``` + +As you can see, the structure may resemble the one of a conventional string +library, however the `buf` field of the structure is different since it is +not a pointer but an array without any length declared, so `buf` actually +points at the first byte just after the `free` integer. So in order to create +an SDS string we just allocate a piece of memory that is as large as the +`sdshdr` structure plus the length of our string, plus an additional byte +for the mandatory null term that every SDS string has. + +The `len` field of the structure is quite obvious, and is the current length +of the SDS string, always computed every time the string is modified via +SDS function calls. The `free` field instead represents the amount of free +memory in the current allocation that can be used to store more characters. + +So the actual SDS layout is this one: + + +------------+------------------------+-----------+---------------\ + | Len | Free | H E L L O W O R L D \n | Null term | Free space \ + +------------+------------------------+-----------+---------------\ + | + `-> Pointer returned to the user. + +You may wonder why there is some free space at the end of the string, it +looks like a waste. Actually after a new SDS string is created, there is no +free space at the end at all: the allocation will be as small as possible to +just hold the header, string, and null term. However other access patterns +will create extra free space at the end, like in the following program: + +```c +s = sdsempty(); +s = sdscat(s,"foo"); +s = sdscat(s,"bar"); +s = sdscat(s,"123"); +``` + +Since SDS tries to be efficient it can't afford to reallocate the string every +time new data is appended, since this would be very inefficient, so it uses +the **preallocation of some free space** every time you enlarge the string. + +The preallocation algorithm used is the following: every time the string +is reallocated in order to hold more bytes, the actual allocation size performed +is two times the minimum required. So for instance if the string currently +is holding 30 bytes, and we concatenate 2 more bytes, instead of allocating 32 +bytes in total SDS will allocate 64 bytes. + +However there is an hard limit to the allocation it can perform ahead, and is +defined by `SDS_MAX_PREALLOC`. SDS will never allocate more than 1MB of +additional space (by default, you can change this default). + +Shrinking strings +--- + +```c +sds sdsRemoveFreeSpace(sds s); +size_t sdsAllocSize(sds s); +``` + +Sometimes there are class of programs that require to use very little memory. +After strings concatenations, trimming, ranges, the string may end having +a non trivial amount of additional space at the end. + +It is possible to resize a string back to its minimal size in order to hold +the current content by using the function `sdsRemoveFreeSpace`. + +```c +s = sdsRemoveFreeSpace(s); +``` + +There is also a function that can be used in order to get the size of the +total allocation for a given string, and is called `sdsAllocSize`. + +```c +sds s = sdsnew("Ladies and gentlemen"); +s = sdscat(s,"... welcome to the C language."); +printf("%d\n", (int) sdsAllocSize(s)); +s = sdsRemoveFreeSpace(s); +printf("%d\n", (int) sdsAllocSize(s)); + +output> 109 +output> 59 +``` + +NOTE: SDS Low level API use cammelCase in order to warn you that you are playing with the fire. + +Manual modifications of SDS strings +--- + + void sdsupdatelen(sds s); + +Sometimes you may want to hack with an SDS string manually, without using +SDS functions. In the following example we implicitly change the length +of the string, however we want the logical length to reflect the null terminated +C string. + +The function `sdsupdatelen` does just that, updating the internal length +information for the specified string to the length obtained via `strlen`. + +```c +sds s = sdsnew("foobar"); +s[2] = '\0'; +printf("%d\n", sdslen(s)); +sdsupdatelen(s); +printf("%d\n", sdslen(s)); + +output> 6 +output> 2 +``` + +Sharing SDS strings +--- + +If you are writing a program in which it is advantageous to share the same +SDS string across different data structures, it is absolutely advised to +encapsulate SDS strings into structures that remember the number of references +of the string, with functions to increment and decrement the number of references. + +This approach is a memory management technique called *reference counting* and +in the context of SDS has two advantages: + +* It is less likely that you'll create memory leaks or bugs due to non freeing SDS strings or freeing already freed strings. +* You'll not need to update every reference to an SDS string when you modify it (since the new SDS string may point to a different memory location). + +While this is definitely a very common programming technique I'll outline +the basic ideas here. You create a structure like that: + +```c +struct mySharedStrings { + int refcount; + sds string; +} +``` + +When new strings are created, the structure is allocated and returned with +`refcount` set to 1. The you have two functions to change the reference count +of the shared string: + +* `incrementStringRefCount` will simply increment `refcount` of 1 in the structure. It will be called every time you add a reference to the string on some new data structure, variable, or whatever. +* `decrementStringRefCount` is used when you remove a reference. This function is however special since when the `refcount` drops to zero, it automatically frees the SDS string, and the `mySharedString` structure as well. + +Interactions with heap checkers +--- + +Because SDS returns pointers into the middle of memory chunks allocated with +`malloc`, heap checkers may have issues, however: + +* The popular Valgrind program will detect SDS strings are *possibly lost* memory and never as *definitely lost*, so it is easy to tell if there is a leak or not. I used Valgrind with Redis for years and every real leak was consistently detected as "definitely lost". +* OSX instrumentation tools don't detect SDS strings as leaks but are able to correctly handle pointers pointing to the middle of memory chunks. + +Zero copy append from syscalls +---- + +At this point you should have all the tools to dig more inside the SDS +library by reading the source code, however there is an interesting pattern +you can mount using the low level API exported, that is used inside Redis +in order to improve performances of the networking code. + +Using `sdsIncrLen()` and `sdsMakeRoomFor()` it is possible to mount the +following schema, to cat bytes coming from the kernel to the end of an +sds string without copying into an intermediate buffer: + +```c +oldlen = sdslen(s); +s = sdsMakeRoomFor(s, BUFFER_SIZE); +nread = read(fd, s+oldlen, BUFFER_SIZE); +... check for nread <= 0 and handle it ... +sdsIncrLen(s, nread); +``` + +`sdsIncrLen` is documented inside the source code of `sds.c`. + +Embedding SDS into your project +=== + +This is as simple as copying the `sds.c` and `sds.h` files inside your +project. The source code is small and every C99 compiler should deal with +it without issues. + +Credits and license +=== + +SDS was created by Salvatore Sanfilippo and is released under the BDS two clause license. See the LICENSE file in this source distribution for more information. @@ -1,5 +1,7 @@ #include "todo.h" +#ifdef CONFIG_TODO + int bbs_todo( term_screen *ts, const char *fname) { int ret=-1; @@ -40,6 +42,9 @@ int bbs_todo( term_screen *ts, const char *fname) //END + //log that someone use todo + bbs_log( NULL, "we are in todo" ); + while( (quit_loop == 0) ) { @@ -79,4 +84,6 @@ int bbs_todo( term_screen *ts, const char *fname) llist_free( todo_list ); return ret; -}
\ No newline at end of file +} + +#endif
\ No newline at end of file diff --git a/todo/todo.txt b/todo/todo.txt deleted file mode 100644 index 3a9516e..0000000 --- a/todo/todo.txt +++ /dev/null @@ -1,5 +0,0 @@ -Add telnet server into binary -Add voting system -Add nice screen resolution detection, resizing -Add loging -Add messaging |