Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xdiskusage for openSUSE:Factory checked in at 2022-01-26 21:27:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdiskusage (Old) and /work/SRC/openSUSE:Factory/.xdiskusage.new.1938 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdiskusage" Wed Jan 26 21:27:00 2022 rev:18 rq:949172 version:1.60 Changes: -------- --- /work/SRC/openSUSE:Factory/xdiskusage/xdiskusage.changes 2021-05-06 22:53:36.750505708 +0200 +++ /work/SRC/openSUSE:Factory/.xdiskusage.new.1938/xdiskusage.changes 2022-01-26 21:27:42.977689661 +0100 @@ -1,0 +2,16 @@ +Tue Jan 25 10:54:52 UTC 2022 - Avinesh Kumar <[email protected]> + +- Update to version 1.60 + * Fixed systems that don't have getdelim (ie non-Linux) + * 'q' menu item to exit (Esc key also works) + * Copy menu item sets X clipboard as well as X selection + * Linux-only fix for files with newlines in their name + (now fixed for non-Linux) + * Browser selects directories + * Improved disk browser that does not truncate disk names + * Fixed the "-" switch that makes it pipe du information from stdin + * Build uses fltk-config so it can be compiled on OSX + * Added "-o file.ps" to directly print a postscript image without + using the gui at all. $DISPLAY does not have to be set for this. + +------------------------------------------------------------------- Old: ---- xdiskusage-1.54.tgz New: ---- xdiskusage-1.60.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdiskusage.spec ++++++ --- /var/tmp/diff_new_pack.7pewJ4/_old 2022-01-26 21:27:43.493686103 +0100 +++ /var/tmp/diff_new_pack.7pewJ4/_new 2022-01-26 21:27:43.505686020 +0100 @@ -1,7 +1,7 @@ # # spec file for package xdiskusage # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xdiskusage -Version: 1.54 +Version: 1.60 Release: 0 Summary: Graphically displays the amount of disk space used by each subdirectory License: GPL-2.0-only ++++++ xdiskusage-1.54.tgz -> xdiskusage-1.60.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdiskusage-1.54/Makefile new/xdiskusage-1.60/Makefile --- old/xdiskusage-1.54/Makefile 2021-01-05 06:47:07.000000000 +0100 +++ new/xdiskusage-1.60/Makefile 2021-08-31 23:18:29.000000000 +0200 @@ -1,7 +1,7 @@ SHELL=/bin/sh PROGRAM = xdiskusage -VERSION = 1.54 +VERSION = 1.60 CXXFILES = panels.C xdiskusage.C diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdiskusage-1.54/README new/xdiskusage-1.60/README --- old/xdiskusage-1.54/README 2021-01-05 06:51:12.000000000 +0100 +++ new/xdiskusage-1.60/README 2021-08-31 23:18:39.000000000 +0200 @@ -1,4 +1,4 @@ -xdiskusage Version 1.54 +xdiskusage Version 1.60 ---------------------------------------------------------------- How to compile xdiskusage: @@ -157,7 +157,7 @@ Stephane Gourichon contributed many suggested improvements. <stephane dot gourichon at lip6 dot fr> -So did Keith Thompson +So did Keith Thompson <Keith.S.Thompson at g mail> ---------------------------------------------------------------- Copyright (C) 2021 Bill Spitzak diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdiskusage-1.54/xdiskusage.1 new/xdiskusage-1.60/xdiskusage.1 --- old/xdiskusage-1.54/xdiskusage.1 2021-01-05 06:51:06.000000000 +0100 +++ new/xdiskusage-1.60/xdiskusage.1 2021-01-05 07:10:58.000000000 +0100 @@ -156,15 +156,6 @@ Gets confused by "df" output on some platforms, requiring platform-specific code. -.SH ACKNOWLEDGEMENTS - -This program was inspired by, and the user interface design copied -from, the "xdu" program written by Phillip C. Dykstra. -<dykstra at ieee dot org> <phil at arl dot army dot mil> - -Stephane Gourichon contributed many suggested improvements. -<stephane dot gourichon at lip6 dot fr> - .SH COPYRIGHT Copyright (C) 2021 Bill Spitzak @@ -187,3 +178,13 @@ .SH AUTHORS Written by Bill Spitzak spitzak at gee m ail dotcom + +This program was inspired by, and the user interface design copied +from, the "xdu" program written by Phillip C. Dykstra. +<dykstra at ieee dot org> <phil at arl dot army dot mil> + +Stephane Gourichon contributed many suggested improvements. +<stephane dot gourichon at lip6 dot fr> + +So did Keith Thompson <Keith.S.Thompson at g mail> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdiskusage-1.54/xdiskusage.C new/xdiskusage-1.60/xdiskusage.C --- old/xdiskusage-1.54/xdiskusage.C 2021-01-05 06:51:30.000000000 +0100 +++ new/xdiskusage-1.60/xdiskusage.C 2021-08-31 23:19:06.000000000 +0200 @@ -1,7 +1,7 @@ // xdiskusage.C const char* copyright = -"xdiskusage version 1.54\n" +"xdiskusage version 1.60\n" "Copyright (C) 2021 Bill Spitzak\n" "Based on xdu by Phillip C. Dykstra\n" "\n" @@ -22,9 +22,6 @@ #if defined _GNU_SOURCE || _POSIX_C_SOURCE >= 200809L #define HAVE_GETDELIM -#define GETDELIM(a,b,c,d) getdelim(a,b,c,d) -#else -#define GETDELIM(a,b,c,d) getdelim_fallback(a,b,c,d) #endif #if defined(DF_COMMAND) @@ -455,7 +452,7 @@ #ifndef HAVE_GETDELIM static ssize_t getdelim_fallback(char **lineptr, size_t *n, int delim, FILE *stream) { - char c; + int c; char *buf; size_t len = 0; size_t buflen; @@ -478,24 +475,24 @@ } for (;;) { - c = (char)getc(stream); + c = getc(stream); if (c == EOF) break; - buf[len] = c; + buf[len] = c; if (++len >= buflen) { char *tmp; buflen += 2048; - tmp = (char*)realloc((void*)buf,buflen); + tmp = (char*)realloc((void*)buf, buflen); if (!tmp) { - errno = EINVAL; + errno = ENOMEM; return -1; } buf = tmp; } - if (c == (char)delim) + if (c == delim) break; } @@ -504,8 +501,10 @@ *lineptr = buf; *n = buflen; - return len - 1; + return len ? len : -1; } + +#define getdelim(a,b,c,d) getdelim_fallback(a,b,c,d) #endif @@ -647,10 +646,14 @@ return 0; } - ssize_t len = 0; - if ((len = GETDELIM(&buffer, &buffer_size, null_term ? 0 : '\n', f)) == -1) { - if (!runningtotal) { - alert("%s: empty or bad file", path ? path : "stdin"); + errno = 0; + ssize_t len; + if ((len = getdelim(&buffer, &buffer_size, null_term ? 0 : '\n', f)) == -1) { + if (errno) { + alert("%s: %s", path ? path : "stdin", strerror(errno)); + } + if (!runningtotal) { // nothing to display + if (!errno) alert("%s: empty or bad file", path ? path : "stdin"); cancelled = 1; continue; } @@ -682,7 +685,7 @@ if (!root->name) root->name = strdup("/"); p++; } - for (newdepth = 0; newdepth < MAXDEPTH && *p;) { + for (newdepth = 0; newdepth < MAXDEPTH-1 && *p;) { parts[++newdepth] = p++; while (*p && *p != '/') p++; if (*p == '/') *p++ = 0; @@ -691,30 +694,22 @@ // find out how many of the fields match: int match = 0; for (; match < newdepth && match < currentdepth; match++) { - if (strcmp(parts[match+1],lastnode[match+1]->name)) break; + if (strcmp(parts[match+1], lastnode[match+1]->name) != 0) break; } // give a total to any subdirectories we are leaving that du did // not report a total for: for (int j = currentdepth; j > match; j--) fix_tree(lastnode[j]); - if (match == newdepth) { - Node* p = lastnode[newdepth]; - ull t = totals[newdepth]+size; - p->size = size; - runningtotal = t; - } else { - Node* p = lastnode[match]; - for (int j = match+1; j <= newdepth; j++) { - totals[j] = runningtotal; - p = newnode(parts[j], 0, p, lastnode[j]); - } - p->size = size; - runningtotal += size; - } - + Node* node = lastnode[match]; + for (int j = match; j < newdepth; j++) { + totals[j+1] = runningtotal; + node = newnode(parts[j+1], 0, node, lastnode[j+1]); + } + node->size = size; + totals[newdepth] += size; + runningtotal = totals[newdepth]; currentdepth = newdepth; - totals[newdepth] = runningtotal; // percent done is rounded to nearest pixel so slider does // not continuousely redraw: @@ -725,7 +720,6 @@ wait_slider->value(v); } } - if (!root->name && path) root->name = strdup(path); if (true_file) { if (path) fclose(f); @@ -786,7 +780,7 @@ root->size = runningtotal; - OutputWindow* d = new OutputWindow(window_w, window_h, root->name); + OutputWindow* d = new OutputWindow(window_w, window_h, path ? path : root->name); d->ncols = ::ncols; d->root = d->current_root = sort(root, largestfirst); d->resizable(d); @@ -855,12 +849,10 @@ fl_draw(buffer, X+3, Y, W-3, H, Fl_Align(FL_ALIGN_LEFT|FL_ALIGN_CLIP|fltk::RAW_LABEL)); #else - // we need to double all the @ signs in the filename, and do - // something with unprintable letters: + // we need to double all the @ and & signs to avoid fltk formatting int i,j; for (i = j = 0; i < 254;) { unsigned char c = (unsigned char)(n->name[j++]); if (!c) break; - if (c < 32 || c==255) c = '?'; buffer[i++] = c; if (c=='@' || c=='&') buffer[i++] = c; } snprintf(buffer+i, 256-i, "%c%s", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdiskusage-1.54/xdiskusage.spec new/xdiskusage-1.60/xdiskusage.spec --- old/xdiskusage-1.54/xdiskusage.spec 2021-01-05 06:48:32.000000000 +0100 +++ new/xdiskusage-1.60/xdiskusage.spec 2021-08-31 23:19:17.000000000 +0200 @@ -6,7 +6,7 @@ Summary: Grapically displays the amount of disks used for by each subdirectory. Name: xdiskusage -Version: 1.54 +Version: 1.60 Release: 1 Source0: http://xdiskusage.sourceforge.net/%{name}-%{version}.tgz Copyright: GPL
