1 files changed, 73 insertions, 31 deletions

diff --git a/swaynag/config.c b/swaynag/config.c
index ca7f4eb2..efd71ce7 100644
--- a/swaynag/config.c
+++ b/swaynag/config.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,24 +10,40 @@
 #include "util.h"
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 
-static char *read_from_stdin(void) {
-        char *buffer = NULL;
-        size_t buffer_len = 0;
-        char *line = NULL;
-        size_t line_size = 0;
-        ssize_t nread;
-        while ((nread = getline(&line, &line_size, stdin)) != -1) {
+static char *read_and_trim_stdin(void) {
+        char *buffer = NULL, *line = NULL;
+        size_t buffer_len = 0, line_size = 0;
+        while (1) {
+                ssize_t nread = getline(&line, &line_size, stdin);
+                if (nread == -1) {
+                        if (feof(stdin)) {
+                                break;
+                        } else {
+                                perror("getline");
+                                goto freeline;
+                        }
+                }
                 buffer = realloc(buffer, buffer_len + nread + 1);
-                snprintf(&buffer[buffer_len], nread + 1, "%s", line);
+                if (!buffer) {
+                        perror("realloc");
+                        goto freebuf;
+                }
+                memcpy(&buffer[buffer_len], line, nread + 1);
                 buffer_len += nread;
         }
         free(line);
 
-        while (buffer && buffer[buffer_len - 1] == '\n') {
+        while (buffer_len && buffer[buffer_len - 1] == '\n') {
                 buffer[--buffer_len] = '\0';
         }
 
         return buffer;
+
+freeline:
+        free(line);
+freebuf:
+        free(buffer);
+        return NULL;
 }
 
 int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
@@ -51,7 +66,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                 TO_PADDING_BTN,
         };
 
-        static struct option opts[] = {
+        static const struct option opts[] = {
                 {"button", required_argument, NULL, 'b'},
                 {"button-no-terminal", required_argument, NULL, 'B'},
                 {"button-dismiss", required_argument, NULL, 'z'},
@@ -59,6 +74,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                 {"config", required_argument, NULL, 'c'},
                 {"debug", no_argument, NULL, 'd'},
                 {"edge", required_argument, NULL, 'e'},
+                {"layer", required_argument, NULL, 'y'},
                 {"font", required_argument, NULL, 'f'},
                 {"help", no_argument, NULL, 'h'},
                 {"detailed-message", no_argument, NULL, 'l'},
@@ -104,6 +120,8 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                 "  -c, --config <path>             Path to config file.\n"
                 "  -d, --debug                     Enable debugging.\n"
                 "  -e, --edge top|bottom           Set the edge to use.\n"
+                "  -y, --layer overlay|top|bottom|background\n"
+            "                                  Set the layer to use.\n"
                 "  -f, --font <font>               Set the font to use.\n"
                 "  -h, --help                      Show help message and quit.\n"
                 "  -l, --detailed-message          Read a detailed message from stdin.\n"
@@ -133,7 +151,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
 
         optind = 1;
         while (1) {
-                int c = getopt_long(argc, argv, "b:B:z:Z:c:de:f:hlL:m:o:s:t:v", opts, NULL);
+                int c = getopt_long(argc, argv, "b:B:z:Z:c:de:y:f:hlL:m:o:s:t:v", opts, NULL);
                 if (c == -1) {
                         break;
                 }
@@ -147,8 +165,11 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                                         fprintf(stderr, "Missing action for button %s\n", optarg);
                                         return EXIT_FAILURE;
                                 }
-                                struct swaynag_button *button;
-                                button = calloc(sizeof(struct swaynag_button), 1);
+                                struct swaynag_button *button = calloc(1, sizeof(struct swaynag_button));
+                                if (!button) {
+                                        perror("calloc");
+                                        return EXIT_FAILURE;
+                                }
                                 button->text = strdup(optarg);
                                 button->type = SWAYNAG_ACTION_COMMAND;
                                 button->action = strdup(argv[optind]);
@@ -184,24 +205,45 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                                 }
                         }
                         break;
+                case 'y': // Layer
+                        if (type) {
+                                if (strcmp(optarg, "background") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND;
+                                } else if (strcmp(optarg, "bottom") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
+                                } else if (strcmp(optarg, "top") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_TOP;
+                                } else if (strcmp(optarg, "overlay") == 0) {
+                                        type->layer = ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY;
+                                } else {
+                                        fprintf(stderr, "Invalid layer: %s\n"
+                                                        "Usage: --layer overlay|top|bottom|background\n",
+                                                        optarg);
+                                        return EXIT_FAILURE;
+                                }
+                        }
+                        break;
                 case 'f': // Font
                         if (type) {
-                                free(type->font);
-                                type->font = strdup(optarg);
+                                pango_font_description_free(type->font_description);
+                                type->font_description = pango_font_description_from_string(optarg);
                         }
                         break;
                 case 'l': // Detailed Message
                         if (swaynag) {
                                 free(swaynag->details.message);
-                                swaynag->details.message = read_from_stdin();
+                                swaynag->details.message = read_and_trim_stdin();
+                                if (!swaynag->details.message) {
+                                        return EXIT_FAILURE;
+                                }
                                 swaynag->details.button_up.text = strdup("▲");
                                 swaynag->details.button_down.text = strdup("▼");
                         }
                         break;
                 case 'L': // Detailed Button Text
                         if (swaynag) {
-                                free(swaynag->details.button_details->text);
-                                swaynag->details.button_details->text = strdup(optarg);
+                                free(swaynag->details.details_text);
+                                swaynag->details.details_text = strdup(optarg);
                         }
                         break;
                 case 'm': // Message
@@ -218,8 +260,7 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag,
                         break;
                 case 's': // Dismiss Button Text
                         if (swaynag) {
-                                struct swaynag_button *button_close;
-                                button_close = swaynag->buttons->items[0];
+                                struct swaynag_button *button_close = swaynag->buttons->items[0];
                                 free(button_close->text);
                                 button_close->text = strdup(optarg);
                         }
@@ -378,23 +419,24 @@ int swaynag_load_config(char *path, struct swaynag *swaynag, list_t *types) {
 
                 if (line[0] == '[') {
                         char *close = strchr(line, ']');
-                        if (!close) {
-                                fprintf(stderr, "Closing bracket not found on line %d\n",
-                                                line_number);
+                        if (!close || close != &line[nread - 2] || nread <= 3) {
+                                fprintf(stderr, "Line %d is malformed\n", line_number);
                                 result = 1;
                                 break;
                         }
-                        char *name = calloc(1, close - line);
-                        strncat(name, line + 1, close - line - 1);
-                        type = swaynag_type_get(types, name);
+                        *close = '\0';
+                        type = swaynag_type_get(types, &line[1]);
                         if (!type) {
-                                type = swaynag_type_new(name);
+                                type = swaynag_type_new(&line[1]);
                                 list_add(types, type);
                         }
-                        free(name);
                 } else {
-                        char *flag = malloc(sizeof(char) * (nread + 3));
-                        sprintf(flag, "--%s", line);
+                        char *flag = malloc(nread + 3);
+                        if (!flag) {
+                                perror("calloc");
+                                return EXIT_FAILURE;
+                        }
+                        snprintf(flag, nread + 3, "--%s", line);
                         char *argv[] = {"swaynag", flag};
                         result = swaynag_parse_options(2, argv, swaynag, types, type,
                                         NULL, NULL);