tFix a few minor issues - ledit - Text editor (WIP) | |
git clone git://lumidify.org/ledit.git (fast, but not encrypted) | |
git clone https://lumidify.org/git/ledit.git (encrypted, but very slow) | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 5399fee446a34094adbe8173734eff0a061a3433 | |
parent fda40061bde8d8401090c09dd525029df7934ee2 | |
Author: lumidify <[email protected]> | |
Date: Sat, 28 May 2022 13:45:39 +0200 | |
Fix a few minor issues | |
Diffstat: | |
M keys_basic.c | 1 + | |
M keys_command.c | 2 +- | |
M ledit.c | 13 +++++++------ | |
M txtbuf.c | 6 ++++-- | |
4 files changed, 13 insertions(+), 9 deletions(-) | |
--- | |
diff --git a/keys_basic.c b/keys_basic.c | |
t@@ -2555,6 +2555,7 @@ handle_key(ledit_view *view, char *key_text, size_t len,… | |
return (struct action){ACTION_NONE, NULL}; | |
} else if (len > 0 && grab_char_cb) { | |
*found = 1; | |
+ *flags = 0; | |
return grab_char_cb(view, key_text, len); | |
} | |
*found = 0; | |
diff --git a/keys_command.c b/keys_command.c | |
t@@ -260,7 +260,7 @@ handle_write(ledit_view *view, char *cmd, size_t l1, size_… | |
/* FIXME: better message */ | |
window_show_message_fmt(view->window, "Wrote file %s",… | |
/* update modification time */ | |
- if ((ret = stat(filename, &sb))) { | |
+ if (stat(filename, &sb)) { | |
/* FIXME: what should be done here? */ | |
} else { | |
view->buffer->file_mtime = sb.st_mtim; | |
diff --git a/ledit.c b/ledit.c | |
t@@ -275,14 +275,15 @@ setup(int argc, char *argv[]) { | |
if (!opt_filename) { | |
uid_t uid = getuid(); | |
struct passwd *pw = getpwuid(uid); | |
- if (!pw) | |
+ if (!pw) { | |
fprintf(stderr, "Unable to determine home directory\n"… | |
- else | |
+ } else { | |
cfgfile = ledit_strcat(pw->pw_dir, "/.leditrc"); | |
- struct stat cfgst; | |
- if (stat(cfgfile, &cfgst)) { | |
- free(cfgfile); | |
- cfgfile = NULL; | |
+ struct stat cfgst; | |
+ if (stat(cfgfile, &cfgst)) { | |
+ free(cfgfile); | |
+ cfgfile = NULL; | |
+ } | |
} | |
} else { | |
struct stat cfgst; | |
diff --git a/txtbuf.c b/txtbuf.c | |
t@@ -72,8 +72,10 @@ txtbuf_destroy(txtbuf *buf) { | |
void | |
txtbuf_copy(txtbuf *dst, txtbuf *src) { | |
txtbuf_resize(dst, src->len); | |
- memcpy(dst->text, src->text, src->len); | |
- dst->text[src->len] = '\0'; | |
+ if (src->text && dst->text) { | |
+ memcpy(dst->text, src->text, src->len); | |
+ dst->text[src->len] = '\0'; | |
+ } | |
dst->len = src->len; | |
} | |