felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-17 23:08:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix up display_len vs len

Browse Source
This commit is contained in:
Dianne Skoll
2022-01-30 14:22:52 -05:00
parent 47af91d136
commit 2502191982
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/calendar.c
View File

@@ -941,6 +941,7 @@ static void PrintLeft(char const *s, int width, char pad)
wchar_t static_buf[128]; wchar_t static_buf[128];
wchar_t *buf; wchar_t *buf;
wchar_t *ws; wchar_t *ws;
int display_len;
if (!len) { if (!len) {
for (i=0; i<width; i++) { for (i=0; i<width; i++) {
@@ -959,14 +960,13 @@ static void PrintLeft(char const *s, int width, char pad)
} }
} }
(void) mbstowcs(buf, s, len+1); (void) mbstowcs(buf, s, len+1);
display_len = wcswidth(buf, len+1);
ws = buf; ws = buf;
for (i=0; i<width; i++) { for (i=0; i<width;) {
if (*ws) { if (*ws) {
PutWideChar(*ws++); PutWideChar(*ws++);
if (wcwidth(*ws) == 0) { i+= wcwidth(*ws);
/* Don't count this character... it's zero-width */
i--;
}
} else { } else {
break; break;
} }
@@ -975,7 +975,7 @@ static void PrintLeft(char const *s, int width, char pad)
while (*ws && wcwidth(*ws) == 0) { while (*ws && wcwidth(*ws) == 0) {
PutWideChar(*ws++); PutWideChar(*ws++);
} }
for (i=len; i<width; i++) fputc(pad, stdout); for (i=display_len; i<width; i++) fputc(pad, stdout);
if (buf != static_buf) free(buf); if (buf != static_buf) free(buf);
#endif #endif