mirror of
https://github.com/javalsai/lidm.git
synced 2025-08-31 18:38:00 +02:00
misc batch of fixes before v1.2.3 (#65)
* fix some formatter and linter issues * make clang-tidy/clang-format fail with error status and output in github error format * docs, add kmscon thing * and some CI stuff
This commit is contained in:
@@ -36,7 +36,7 @@ int pam_conversation(int num_msg, const struct pam_message** msg,
|
||||
}
|
||||
|
||||
#ifndef PAM_SERVICE_FALLBACK
|
||||
#define PAM_SERVICE_FALLBACK "login"
|
||||
#define PAM_SERVICE_FALLBACK "login"
|
||||
#endif
|
||||
|
||||
#define CHECK_PAM_RET(call) \
|
||||
|
@@ -243,7 +243,7 @@ int parse_config(struct config* NNULLABLE config, char* NNULLABLE path) {
|
||||
if (fd == NULL) {
|
||||
log_perror("fopen");
|
||||
log_printf(" [I] No config, place one at " LIDM_CONF_PATH
|
||||
" or set the LIDM_CONF env variable");
|
||||
" or set the LIDM_CONF env variable\n");
|
||||
return 0; // Its fine now anyways
|
||||
}
|
||||
|
||||
|
@@ -32,7 +32,7 @@ void log_perror(const char* s) {
|
||||
if (!logger_out) return;
|
||||
|
||||
if (s)
|
||||
(void)fprintf(logger_out, "%s: %s", s, strerror(errno));
|
||||
(void)fprintf(logger_out, "%s: %s\n", s, strerror(errno));
|
||||
else
|
||||
(void)fprintf(logger_out, "%s", strerror(errno));
|
||||
(void)fprintf(logger_out, "%s\n", strerror(errno));
|
||||
}
|
||||
|
4
src/ui.c
4
src/ui.c
@@ -115,13 +115,13 @@ char* trunc_gethostname(const size_t MAXLEN, const char* const ELLIPSIS) {
|
||||
char* buf = malloc(alloc_size);
|
||||
if (!buf) return NULL;
|
||||
|
||||
if(gethostname(buf, alloc_size) != 0) {
|
||||
if (gethostname(buf, alloc_size) != 0) {
|
||||
free(buf);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (utf8len(buf) > MAXLEN) {
|
||||
int end = utf8trunc(buf, MAXLEN - utf8len(ELLIPSIS));
|
||||
size_t end = utf8trunc(buf, MAXLEN - utf8len(ELLIPSIS));
|
||||
strcpy(&buf[end], ELLIPSIS);
|
||||
}
|
||||
return buf;
|
||||
|
@@ -106,12 +106,12 @@ size_t utf8len_until(const char* str, const char* until) {
|
||||
size_t utf8trunc(char* str, size_t n) {
|
||||
size_t bytes = 0;
|
||||
while (true) {
|
||||
if(str[bytes] == '\0') break;
|
||||
if (str[bytes] == '\0') break;
|
||||
if (utf8_iscont(str[bytes])) {
|
||||
bytes++;
|
||||
continue;
|
||||
}
|
||||
if(n == 0) {
|
||||
if (n == 0) {
|
||||
str[bytes] = '\0';
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user