diff options
author | Michael Jennings <mej@lanl.gov> | 2020-02-28 17:06:54 -0700 |
---|---|---|
committer | Michael Jennings <mej@lanl.gov> | 2020-02-28 17:06:54 -0700 |
commit | 5d475d010500ffaf1801266e7d1d99f7494b114e (patch) | |
tree | 0c38ac261f813ade37e69fc644bfaadaee6b5463 /src | |
parent | 37d7e09045f5c4035f749cad4ffa7f5808f3f230 (diff) | |
download | eterm-5d475d010500ffaf1801266e7d1d99f7494b114e.tar.gz |
src/*.c, Eterm.spec: Various build fixes
Several changes here to make it build on RHEL/CentOS 8:
- Replace outdated MEMSET() macro with (g)libc memset()
- Update Release field to use `git describe` just like LibAST
- Fix `make distcheck` by adding an uninstall-hook for src/gdb.scr
- At long last, remove the ancient RPM %changelog content
- Fix incompatibility with my traditional choices for CFLAGS
(-O0 -g3) and modern RHEL security/hardening goop which, due to
being implemented in the GCC optimizer, is rendered non-functional
by building with -O0!
- Rename backgrounds tarball so that it doesn't have the Eterm
version in its name since, shockingly, it never changes based on
the version of Eterm!
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 9 | ||||
-rw-r--r-- | src/buttons.c | 4 | ||||
-rw-r--r-- | src/command.c | 8 | ||||
-rw-r--r-- | src/encoding.c | 4 | ||||
-rw-r--r-- | src/events.c | 2 | ||||
-rw-r--r-- | src/font.c | 12 | ||||
-rw-r--r-- | src/menus.c | 4 | ||||
-rw-r--r-- | src/options.c | 14 | ||||
-rw-r--r-- | src/pixmap.c | 8 | ||||
-rw-r--r-- | src/screen.c | 10 | ||||
-rw-r--r-- | src/scrollbar.c | 2 | ||||
-rw-r--r-- | src/startup.c | 2 | ||||
-rw-r--r-- | src/utmp.c | 8 |
13 files changed, 46 insertions, 41 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index caaf5e9..52cf4f8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,8 +40,13 @@ Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir) Eterm_LDADD = libEterm.la EXTRA_DIST = gdb.scr mmx_cmod.S sse2_cmod.c +MAINTAINERCLEANFILES = Makefile.in +DISTCLEANFILES = Makefile install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - test ! -z "$(GDB_CMD_FILE)" && $(INSTALL_DATA) $(srcdir)/gdb.scr $(DESTDIR)$(pkgdatadir)/ || : -MAINTAINERCLEANFILES=Makefile.in + -test ! -z "$(GDB_CMD_FILE)" && $(INSTALL_DATA) $(srcdir)/gdb.scr $(DESTDIR)$(pkgdatadir)/ + +uninstall-hook: + $(RM) $(DESTDIR)$(pkgdatadir)/gdb.scr + diff --git a/src/buttons.c b/src/buttons.c index 1c42d5a..21946ad 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -84,7 +84,7 @@ buttonbar_t *bbar_create(void) XSetWindowAttributes xattr; bbar = (buttonbar_t *) MALLOC(sizeof(buttonbar_t)); - MEMSET(bbar, 0, sizeof(buttonbar_t)); + memset(bbar, 0, sizeof(buttonbar_t)); xattr.border_pixel = BlackPixel(Xdisplay, Xscreen); xattr.save_under = FALSE; @@ -749,7 +749,7 @@ button_t *button_create(char *text) button_t *button; button = (button_t *) MALLOC(sizeof(button_t)); - MEMSET(button, 0, sizeof(button_t)); + memset(button, 0, sizeof(button_t)); if (text) { button->text = STRDUP(text); diff --git a/src/command.c b/src/command.c index cd3f27e..bd6db62 100644 --- a/src/command.c +++ b/src/command.c @@ -2831,7 +2831,7 @@ matrix(int n) return; } - MEMSET(s, 0, TERM_WINDOW_GET_COLS()); + memset(s, 0, TERM_WINDOW_GET_COLS()); #define MATRIX_HI CLEAR #define MATRIX_LO ((4<<8)|CLEAR) @@ -3195,7 +3195,7 @@ tt_winsize(int fd) if (fd < 0) return; - MEMSET(&ws, 0, sizeof(struct winsize)); + memset(&ws, 0, sizeof(struct winsize)); ws.ws_row = (unsigned short) TERM_WINDOW_GET_REPORTED_ROWS(); ws.ws_col = (unsigned short) TERM_WINDOW_GET_REPORTED_COLS(); @@ -3725,9 +3725,9 @@ main_loop(void) } libast_print_warning("Moo2: %s\n", safe_print_string(outbuff, outlen)); - MEMSET(outbuff + outlen, 0, sizeof(wchar_t)); + memset(outbuff + outlen, 0, sizeof(wchar_t)); wcbuff = (wchar_t *) outbuff; - MEMSET(&mbs, 0, sizeof(mbstate_t)); + memset(&mbs, 0, sizeof(mbstate_t)); outlen = wcsrtombs(NULL, &wcbuff, 0, &mbs) + 1; if (outlen > 0) { outbuff = (char *) MALLOC(outlen); diff --git a/src/encoding.c b/src/encoding.c index 7ec76cf..7f274b9 100644 --- a/src/encoding.c +++ b/src/encoding.c @@ -184,7 +184,7 @@ static enc_context_t *enc_create_context(const char *id) enc_context_t *tmp; tmp = (enc_context_t *) MALLOC(sizeof(enc_context_t)); - MEMSET(tmp, 0, sizeof(enc_context_t)); + memset(tmp, 0, sizeof(enc_context_t)); tmp->id = STRDUP(id); return tmp; } @@ -204,7 +204,7 @@ static enc_state_t *enc_create_state(const char *id, unsigned char lifetime) enc_state_t *tmp; tmp = (enc_state_t *) MALLOC(sizeof(enc_state_t)); - MEMSET(tmp, 0, sizeof(enc_state_t)); + memset(tmp, 0, sizeof(enc_state_t)); tmp->id = STRDUP(id); tmp->lifetime = lifetime; return tmp; diff --git a/src/events.c b/src/events.c index 43f255d..ecf1744 100644 --- a/src/events.c +++ b/src/events.c @@ -133,7 +133,7 @@ void event_init_primary_dispatcher(void) { - MEMSET(&primary_data, 0, sizeof(event_dispatcher_data_t)); + memset(&primary_data, 0, sizeof(event_dispatcher_data_t)); EVENT_DATA_ADD_HANDLER(primary_data, KeyPress, handle_key_press); EVENT_DATA_ADD_HANDLER(primary_data, PropertyNotify, handle_property_notify); @@ -79,23 +79,23 @@ eterm_font_add(char ***plist, const char *fontname, unsigned char idx) /* The below looks messy with all the cpp stuff, but it really just malloc's/realloc's both etfonts and etmfonts at the same time to the same size, zeros all the new - memory space using MEMSET(), and then prints some goop. */ + memory space using memset(), and then prints some goop. */ if (etfonts) { etfonts = (char **) REALLOC(etfonts, new_size); - MEMSET(etfonts + font_cnt, 0, sizeof(char *) * (idx - font_cnt + 1)); + memset(etfonts + font_cnt, 0, sizeof(char *) * (idx - font_cnt + 1)); #ifdef MULTI_CHARSET etmfonts = (char **) REALLOC(etmfonts, new_size); - MEMSET(etmfonts + font_cnt, 0, sizeof(char *) * (idx - font_cnt + 1)); + memset(etmfonts + font_cnt, 0, sizeof(char *) * (idx - font_cnt + 1)); D_FONT((" -> Reallocated font lists: %u bytes at %8p/%8p\n", new_size, etfonts, etmfonts)); #else D_FONT((" -> Reallocated font list: %u bytes at %8p\n", new_size, etfonts)); #endif } else { etfonts = (char **) MALLOC(new_size); - MEMSET(etfonts, 0, new_size); + memset(etfonts, 0, new_size); #ifdef MULTI_CHARSET etmfonts = (char **) MALLOC(new_size); - MEMSET(etmfonts, 0, new_size); + memset(etmfonts, 0, new_size); D_FONT((" -> Allocated font lists: %u bytes at %8p/%8p\n", new_size, etfonts, etmfonts)); #else D_FONT((" -> Allocating font list: %u bytes at %8p\n", new_size, etfonts)); @@ -751,7 +751,7 @@ parse_font_fx(char *line) n = spiftool_num_words(line); if (!BEG_STRCASECMP(line, "none")) { - MEMSET(&fshadow, 0, sizeof(fontshadow_t)); + memset(&fshadow, 0, sizeof(fontshadow_t)); } else if (!BEG_STRCASECMP(line, "outline")) { if (n != 2) { return 0; diff --git a/src/menus.c b/src/menus.c index 0b7ea67..f8306d6 100644 --- a/src/menus.c +++ b/src/menus.c @@ -471,7 +471,7 @@ menu_t *menu_create(char *title) | Button1MotionMask | Button2MotionMask | Button3MotionMask; } menu = (menu_t *) MALLOC(sizeof(menu_t)); - MEMSET(menu, 0, sizeof(menu_t)); + memset(menu, 0, sizeof(menu_t)); menu->title = STRDUP(title ? title : ""); menu->win = @@ -715,7 +715,7 @@ menuitem_t *menuitem_create(char *text) menuitem_t *menuitem; menuitem = (menuitem_t *) MALLOC(sizeof(menuitem_t)); - MEMSET(menuitem, 0, sizeof(menuitem_t)); + memset(menuitem, 0, sizeof(menuitem_t)); if (text) { menuitem->text = STRDUP(text); diff --git a/src/options.c b/src/options.c index aa19b9a..7531aa6 100644 --- a/src/options.c +++ b/src/options.c @@ -1731,11 +1731,11 @@ parse_image(char *buff, void *state) return NULL; } if (new) { - MEMSET(images[idx].current, 0, sizeof(simage_t)); + memset(images[idx].current, 0, sizeof(simage_t)); images[idx].current->pmap = (pixmap_t *) MALLOC(sizeof(pixmap_t)); images[idx].current->iml = (imlib_t *) MALLOC(sizeof(imlib_t)); - MEMSET(images[idx].current->pmap, 0, sizeof(pixmap_t)); - MEMSET(images[idx].current->iml, 0, sizeof(imlib_t)); + memset(images[idx].current->pmap, 0, sizeof(pixmap_t)); + memset(images[idx].current->iml, 0, sizeof(imlib_t)); } } else if (!BEG_STRCASECMP(buff, "color ")) { char *fg = spiftool_get_word(2, buff), *bg = spiftool_get_word(3, buff); @@ -2546,10 +2546,10 @@ init_defaults(void) rs_path = NULL; #endif colorfgbg = DEFAULT_RSTYLE; - MEMSET(PixColors, 0, sizeof(PixColors)); + memset(PixColors, 0, sizeof(PixColors)); /* Font stuff. */ - MEMSET(rs_font, 0, sizeof(char *) * NFONTS); + memset(rs_font, 0, sizeof(char *) * NFONTS); #if AUTO_ENCODING /* Auto-encoding means the default fonts are chosen by locale. */ # ifdef MULTI_CHARSET @@ -2756,8 +2756,8 @@ post_parse(void) simg->iml = (imlib_t *) MALLOC(sizeof(imlib_t)); simg->fg = WhitePixel(Xdisplay, Xscreen); simg->bg = BlackPixel(Xdisplay, Xscreen); - MEMSET(simg->pmap, 0, sizeof(pixmap_t)); - MEMSET(simg->iml, 0, sizeof(imlib_t)); + memset(simg->pmap, 0, sizeof(pixmap_t)); + memset(simg->iml, 0, sizeof(imlib_t)); images[i].mode = MODE_IMAGE & ALLOW_IMAGE; } images[i].current = simg; diff --git a/src/pixmap.c b/src/pixmap.c index b544ad0..2403b62 100644 --- a/src/pixmap.c +++ b/src/pixmap.c @@ -357,7 +357,7 @@ image_t *create_eterm_image(void) image_t *i; i = (image_t *) MALLOC(sizeof(image_t)); - MEMSET(i, 0, sizeof(image_t)); + memset(i, 0, sizeof(image_t)); return (i); } @@ -431,11 +431,11 @@ simage_t *create_simage(void) simage_t *s; s = (simage_t *) MALLOC(sizeof(simage_t)); - MEMSET(s, 0, sizeof(simage_t)); + memset(s, 0, sizeof(simage_t)); s->pmap = (pixmap_t *) MALLOC(sizeof(pixmap_t)); s->iml = (imlib_t *) MALLOC(sizeof(imlib_t)); - MEMSET(s->pmap, 0, sizeof(pixmap_t)); - MEMSET(s->iml, 0, sizeof(imlib_t)); + memset(s->pmap, 0, sizeof(pixmap_t)); + memset(s->iml, 0, sizeof(imlib_t)); return s; } diff --git a/src/screen.c b/src/screen.c index ed41535..582cdde 100644 --- a/src/screen.c +++ b/src/screen.c @@ -109,7 +109,7 @@ blank_line(text_t *et, rend_t *er, int width, rend_t efs) register unsigned int i = width; rend_t *r = er, fs = efs; - MEMSET(et, ' ', i); + memset(et, ' ', i); for (; i--;) *r++ = fs; } @@ -126,7 +126,7 @@ blank_screen_mem(text_t **tp, rend_t **rp, int row, rend_t efs) tp[row] = MALLOC(sizeof(text_t) * (TERM_WINDOW_GET_REPORTED_COLS() + 1)); rp[row] = MALLOC(sizeof(rend_t) * TERM_WINDOW_GET_REPORTED_COLS()); } - MEMSET(tp[row], ' ', i); + memset(tp[row], ' ', i); tp[row][i] = 0; for (r = rp[row]; i--;) *r++ = fs; @@ -355,7 +355,7 @@ scr_poweron(void) D_SCREEN(("scr_poweron()\n")); /* Reset all character sets to Latin1 */ - MEMSET(charsets, 'B', sizeof(charsets)); + memset(charsets, 'B', sizeof(charsets)); rvideo = 0; /* Reset the rendering style to the default colors/style */ scr_rendition(0, ~RS_None); @@ -1304,7 +1304,7 @@ void scr_set_tab(int mode) { if (mode < 0) - MEMSET(tabs, 0, (unsigned int) TERM_WINDOW_GET_REPORTED_COLS()); + memset(tabs, 0, (unsigned int) TERM_WINDOW_GET_REPORTED_COLS()); else if (screen.col < TERM_WINDOW_GET_REPORTED_COLS()) tabs[screen.col] = (mode ? 1 : 0); @@ -1510,7 +1510,7 @@ scr_expose(int x, int y, int width, int height) rect_end.col, rect_end.row)); for (i = rect_beg.row; i <= rect_end.row; i++) { - MEMSET(&(drawn_text[i][rect_beg.col]), 0, rect_end.col - rect_beg.col + 1); + memset(&(drawn_text[i][rect_beg.col]), 0, rect_end.col - rect_beg.col + 1); } } diff --git a/src/scrollbar.c b/src/scrollbar.c index 2c3fc3b..91189eb 100644 --- a/src/scrollbar.c +++ b/src/scrollbar.c @@ -73,7 +73,7 @@ void scrollbar_event_init_dispatcher(void) { - MEMSET(&scrollbar_event_data, 0, sizeof(event_dispatcher_data_t)); + memset(&scrollbar_event_data, 0, sizeof(event_dispatcher_data_t)); EVENT_DATA_ADD_HANDLER(scrollbar_event_data, EnterNotify, sb_handle_enter_notify); EVENT_DATA_ADD_HANDLER(scrollbar_event_data, LeaveNotify, sb_handle_leave_notify); diff --git a/src/startup.c b/src/startup.c index 576c60f..30cbd86 100644 --- a/src/startup.c +++ b/src/startup.c @@ -137,7 +137,7 @@ eterm_bootstrap(int argc, char *argv[]) get_modifiers(); /* Set up modifier masks before parsing config files. */ /* Get all our properties set up. */ - MEMSET(props, 0, sizeof(props)); + memset(props, 0, sizeof(props)); props[PROP_TEXT] = XInternAtom(Xdisplay, "TEXT", False); props[PROP_COMPOUND_TEXT] = XInternAtom(Xdisplay, "COMPOUND_TEXT", False); props[PROP_UTF8_STRING] = XInternAtom(Xdisplay, "UTF8_STRING", False); @@ -97,10 +97,10 @@ add_utmp_entry(const char *pty, const char *hostname, int fd) # ifdef HAVE_UTMPX_H struct utmpx utmp; struct utmp utmp2; - MEMSET(&utmp, 0, sizeof(struct utmpx)); + memset(&utmp, 0, sizeof(struct utmpx)); # else struct utmp utmp; - MEMSET(&utmp, 0, sizeof(struct utmp)); + memset(&utmp, 0, sizeof(struct utmp)); # endif # ifdef WITH_DMALLOC @@ -336,7 +336,7 @@ add_utmp_entry(const char *pty, const char *hostname, int fd) struct passwd *pwent = getpwuid(my_ruid); struct utmp utmp; - MEMSET(&utmp, 0, sizeof(struct utmp)); + memset(&utmp, 0, sizeof(struct utmp)); if (!strncmp(pty, "/dev/", 5)) pty += 5; /* skip /dev/ prefix */ @@ -386,7 +386,7 @@ remove_utmp_entry(void) privileges(INVOKE); if (!ut_id[0] && (fd = fopen(UTMP_FILENAME, "r+"))) { struct utmp utmp; - MEMSET(&utmp, 0, sizeof(struct utmp)); + memset(&utmp, 0, sizeof(struct utmp)); fseek(fd, utmp_pos, 0); fwrite(&utmp, sizeof(struct utmp), 1, fd); |