Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package growlight for openSUSE:Factory checked in at 2021-03-08 15:19:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/growlight (Old) and /work/SRC/openSUSE:Factory/.growlight.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "growlight" Mon Mar 8 15:19:14 2021 rev:10 rq:877585 version:1.2.31 Changes: -------- --- /work/SRC/openSUSE:Factory/growlight/growlight.changes 2021-02-16 09:19:08.567179796 +0100 +++ /work/SRC/openSUSE:Factory/.growlight.new.2378/growlight.changes 2021-03-08 15:20:57.574101354 +0100 @@ -1,0 +2,6 @@ +Sat Mar 6 12:20:42 UTC 2021 - Martin Hauke <mar...@gmx.de> + +- Update to version 1.2.31 + * Upstream does not provide a changelog + +------------------------------------------------------------------- Old: ---- growlight-1.2.28.tar.gz New: ---- growlight-1.2.31.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ growlight.spec ++++++ --- /var/tmp/diff_new_pack.4i9k0T/_old 2021-03-08 15:20:58.118101753 +0100 +++ /var/tmp/diff_new_pack.4i9k0T/_new 2021-03-08 15:20:58.122101755 +0100 @@ -23,7 +23,7 @@ %bcond_without pandoc %endif Name: growlight -Version: 1.2.28 +Version: 1.2.31 Release: 0 Summary: Disk manipulation and system setup tool License: GPL-3.0-or-later ++++++ growlight-1.2.28.tar.gz -> growlight-1.2.31.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/growlight-1.2.28/CMakeLists.txt new/growlight-1.2.31/CMakeLists.txt --- old/growlight-1.2.28/CMakeLists.txt 2021-02-12 16:38:09.000000000 +0100 +++ new/growlight-1.2.31/CMakeLists.txt 2021-02-16 23:37:17.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(growlight VERSION 1.2.27 +project(growlight VERSION 1.2.31 DESCRIPTION "Block device and filesystem manager" HOMEPAGE_URL "https://nick-black.com/dankwiki/index.php/Growlight"; LANGUAGES C CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/growlight-1.2.28/doc/man/man8/growlight-readline.8.md new/growlight-1.2.31/doc/man/man8/growlight-readline.8.md --- old/growlight-1.2.28/doc/man/man8/growlight-readline.8.md 2021-02-12 16:38:09.000000000 +0100 +++ new/growlight-1.2.31/doc/man/man8/growlight-readline.8.md 2021-02-16 23:37:17.000000000 +0100 @@ -1,6 +1,6 @@ % growlight-readline(8) % nick black <nickbl...@linux.com> -% v1.2.28 +% v1.2.31 # NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/growlight-1.2.28/doc/man/man8/growlight.8.md new/growlight-1.2.31/doc/man/man8/growlight.8.md --- old/growlight-1.2.28/doc/man/man8/growlight.8.md 2021-02-12 16:38:09.000000000 +0100 +++ new/growlight-1.2.31/doc/man/man8/growlight.8.md 2021-02-16 23:37:17.000000000 +0100 @@ -1,6 +1,6 @@ % growlight(8) % nick black <nickbl...@linux.com> -% v1.2.28 +% v1.2.31 # NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/growlight-1.2.28/src/readline/readline.c new/growlight-1.2.31/src/readline/readline.c --- old/growlight-1.2.28/src/readline/readline.c 2021-02-12 16:38:09.000000000 +0100 +++ new/growlight-1.2.31/src/readline/readline.c 2021-02-16 23:37:17.000000000 +0100 @@ -1775,10 +1775,12 @@ static void do_logo(void){ - int v = ncdirect_render_image(ncd, GROWLIGHT_SHARE "/growlight.jpg", - NCALIGN_CENTER, NCBLIT_DEFAULT, NCSCALE_SCALE_HIRES); - if(v >= 0){ - return; + if(ncd){ + int v = ncdirect_render_image(ncd, GROWLIGHT_SHARE "/growlight.jpg", + NCALIGN_CENTER, NCBLIT_DEFAULT, NCSCALE_SCALE_HIRES); + if(v >= 0){ + return; + } } use_terminfo_color(COLOR_RED, 1); printf("+++++++++++++++++++++++++++++++++++++++++++++++++############++++++++++++++++++\n" @@ -2048,19 +2050,35 @@ return 0; } +// heap-allocated input line, using readline if available, fgets() otherwise. +static char* +getinline(const char* prompt){ + if(ncd){ + return ncdirect_readline(ncd, prompt); + } + size_t buflen = 8192; + char* buf = malloc(buflen); // sure FIXME + if(buf){ + if(fgets(buf, buflen, stdin) == NULL){ + free(buf); + buf = NULL; + } + } + return buf; +} + #define RL_START "\x01" // RL_PROMPT_START_IGNORE #define RL_END "\x02" // RL_PROMPT_END_IGNORE - static int tty_ui(void){ - char prompt[80] = RL_START "\033[0;35m" RL_END - "[" RL_START "\033[0;36m" RL_END - PACKAGE RL_START "\033[0;35m" RL_END - "]" RL_START "\033[1;32m" RL_END - "(0)> " RL_START "\033[1;37m" RL_END; + static char prompt[80] = RL_START "\033[0;35m" RL_END + "[" RL_START "\033[0;36m" RL_END + PACKAGE RL_START "\033[0;35m" RL_END + "]" RL_START "\033[1;32m" RL_END + "(0)> " RL_START "\033[1;37m" RL_END; char *l; - while( (l = ncdirect_readline(ncd, prompt)) ){ + while( (l = getinline(prompt)) ){ const struct fxn *fxn; wchar_t **tokes; int z; @@ -2115,6 +2133,8 @@ printf("\n"); return 0; } +#undef RL_END +#undef RL_START // FIXME it'd be nice to do secondary completion (ie command-sensitive) for // command arguments @@ -2209,6 +2229,8 @@ rl_attempted_completion_function = growlight_completion; if((ncd = ncdirect_init(NULL, NULL, flags)) == NULL){ fprintf(stderr, "Couldn't set up notcurses\n"); + growlight_stop(); + return EXIT_FAILURE; } } if(tty_ui()){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/growlight-1.2.28/tools/release new/growlight-1.2.31/tools/release --- old/growlight-1.2.28/tools/release 2021-02-12 16:38:09.000000000 +0100 +++ new/growlight-1.2.31/tools/release 2021-02-16 23:37:17.000000000 +0100 @@ -12,7 +12,7 @@ git clean -f -d -x # bump version numbers wherever they occur (wherever we enumerate them, anyway) -sed -i -e "s/\(project(notcurses VERSION \)$OLDVERSION/\1$VERSION/" CMakeLists.txt +sed -i -e "s/\(project(growlight VERSION \)$OLDVERSION/\1$VERSION/" CMakeLists.txt for i in doc/man/man*/*.md ; do sed -i -e "s/% v$OLDVERSION/% v$VERSION/" "$i" done
