felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-16 06:18:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make -w0 behave the same as -wt instead of causing an infinite loop.

Browse Source
This commit is contained in:
Dianne Skoll
2023-10-02 23:03:30 -04:00
parent 3e36ffa9ff
commit 44d489d3d2
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/init.c
View File

@@ -543,7 +543,7 @@ void InitRemind(int argc, char const *argv[])
arg++;
/* -wt means get width from /dev/tty */
ttyfd = open("/dev/tty", O_RDONLY);
if (!ttyfd) {
if (ttyfd < 0) {
fprintf(stderr, "%s: `-wt': Cannot open /dev/tty: %s\n",
argv[0], strerror(errno));
} else {
@@ -554,7 +554,16 @@ void InitRemind(int argc, char const *argv[])
PARSENUM(CalWidth, arg);
if (CalWidth != 0 && CalWidth < 71) CalWidth = 71;
if (CalWidth == 0) {
CalWidth = -1;
/* Cal witdh of 0 is same as t */
ttyfd = open("/dev/tty", O_RDONLY);
if (ttyfd < 0) {
fprintf(stderr, "%s: `-w0': Cannot open /dev/tty: %s\n",
argv[0], strerror(errno));
CalWidth = 80;
} else {
InitCalWidthAndFormWidth(ttyfd);
close(ttyfd);
}
}
FormWidth = CalWidth - 8;
if (FormWidth < 20) FormWidth = 20;