diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/local.mk | 5 | ||||
| -rw-r--r-- | src/util.c | 44 | ||||
| -rw-r--r-- | src/util.h | 26 |
4 files changed, 75 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 89ebdbe..a506671 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,7 @@ test -d "${srcdir}/.git" || CFLAGS="${save_CFLAGS}" funcs_missing=false AC_CHECK_FUNCS( [\ - calloc free rand srand + calloc free malloc memcpy rand srand strlen ], [], [funcs_missing=true]) diff --git a/src/local.mk b/src/local.mk index 4414cdc..c72cb44 100644 --- a/src/local.mk +++ b/src/local.mk @@ -1,4 +1,7 @@ mazefight_SOURCES += \ %reldir%/defs.h \ %reldir%/main.c \ - %reldir%/maze.c + %reldir%/maze.c \ + %reldir%/maze.h \ + %reldir%/util.c \ + %reldir%/util.h diff --git a/src/util.c b/src/util.c new file mode 100644 index 0000000..5e8effc --- /dev/null +++ b/src/util.c @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2021 P. J. McDermott + * + * This file is part of Maze Fight + * + * Maze Fight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Maze Fight is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Maze Fight. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <stdlib.h> +#include <string.h> +#include "util.h" + +char * +mf_strcat(const char *str1, const char *str2) +{ + size_t str1_len; + size_t str2_len; + char *dest; + + str1_len = strlen(str1); + str2_len = strlen(str2); + + dest = malloc((str1_len + str2_len + 1) * sizeof(*dest)); + if (dest == NULL) { + return NULL; + } + + memcpy(dest, str1, str1_len); + memcpy(dest + str1_len, str2, str2_len); + dest[str1_len + str2_len] = '\0'; + + return dest; +} diff --git a/src/util.h b/src/util.h new file mode 100644 index 0000000..47688e9 --- /dev/null +++ b/src/util.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2021 P. J. McDermott + * + * This file is part of Maze Fight + * + * Maze Fight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Maze Fight is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Maze Fight. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef MF_UTIL_H_ +#define MF_UTIL_H_ + +char * +mf_strcat(const char *str1, const char *str2); + +#endif /* MF_UTIL_H_ */ |