From 85bc36e5b1ffe9006a00e565eb4437cb07932949 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Mon, 17 Nov 2025 18:20:56 +0900 Subject: [PATCH] format --- .clang-format | 21 +++++++++++++++++++++ format.sh | 3 +++ include/MDE/Directory.h | 2 +- include/MDE/Users.h | 2 +- src/directory.c | 12 ++++++------ src/file.c | 12 ++++++------ src/string.c | 2 +- src/users.c | 6 +++--- 8 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 .clang-format create mode 100755 format.sh diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..f4cf343 --- /dev/null +++ b/.clang-format @@ -0,0 +1,21 @@ +--- +# $Id: .clang-format 567 2025-11-02 00:00:24Z nishi $ +Language: Cpp +UseTab: Always +TabWidth: 8 +AlignConsecutiveAssignments: + Enabled: true +AlignConsecutiveDeclarations: + Enabled: true +IndentWidth: 8 +PointerAlignment: Left +ColumnLimit: 0 +AllowShortIfStatementsOnASingleLine: Always +AllowShortBlocksOnASingleLine: Never +AllowShortFunctionsOnASingleLine: Empty +AllowShortLoopsOnASingleLine: true +SpaceBeforeParens: Never +AlignEscapedNewlines: DontAlign +SortIncludes: false +AllowShortEnumsOnASingleLine: false +#IndentPPDirectives: AfterHash diff --git a/format.sh b/format.sh new file mode 100755 index 0000000..393b0a0 --- /dev/null +++ b/format.sh @@ -0,0 +1,3 @@ +#!/bin/sh +DIRS="include src" +clang-format --verbose -i `find $DIRS -name "*.c" -or -name "*.h"` diff --git a/include/MDE/Directory.h b/include/MDE/Directory.h index 9b7a18a..733bb0d 100644 --- a/include/MDE/Directory.h +++ b/include/MDE/Directory.h @@ -7,7 +7,7 @@ extern "C" { #endif -void MDEDirectoryScan(const char* path, void(*call)(const char* name, int dir, void* user), void* user); +void MDEDirectoryScan(const char* path, void (*call)(const char* name, int dir, void* user), void* user); #ifdef __cplusplus } diff --git a/include/MDE/Users.h b/include/MDE/Users.h index 9d0d074..f92406c 100644 --- a/include/MDE/Users.h +++ b/include/MDE/Users.h @@ -7,7 +7,7 @@ extern "C" { #endif -void MDEUsersList(void(*call)(const char* name, void* user), void* user); +void MDEUsersList(void (*call)(const char* name, void* user), void* user); #ifdef __cplusplus } diff --git a/src/directory.c b/src/directory.c index d57b87b..a4d1675 100644 --- a/src/directory.c +++ b/src/directory.c @@ -5,12 +5,12 @@ #include #include -void MDEDirectoryScan(const char* path, void(*call)(const char* name, int dir, void* user), void* user){ +void MDEDirectoryScan(const char* path, void (*call)(const char* name, int dir, void* user), void* user) { DIR* dir = opendir(path); - if(dir != NULL){ + if(dir != NULL) { struct dirent* d; - while((d = readdir(dir)) != NULL){ - char* p; + while((d = readdir(dir)) != NULL) { + char* p; struct stat s; if(strcmp(d->d_name, "..") == 0 || strcmp(d->d_name, ".") == 0) continue; @@ -19,10 +19,10 @@ void MDEDirectoryScan(const char* path, void(*call)(const char* name, int dir, v if(path[strlen(path) - 1] != '/') strcat(p, "/"); strcat(p, d->d_name); - if(stat(p, &s) == 0){ + if(stat(p, &s) == 0) { call(p, S_ISDIR(s.st_mode) ? 1 : 0, user); } - + free(p); } closedir(dir); diff --git a/src/file.c b/src/file.c index 3108bd0..1edac37 100644 --- a/src/file.c +++ b/src/file.c @@ -2,21 +2,21 @@ #include -void MDEFileCopy(const char* src, const char* dst){ - char buffer[4096]; +void MDEFileCopy(const char* src, const char* dst) { + char buffer[4096]; FILE* in; FILE* out; - int r; + int r; if((in = fopen(src, "rb")) == NULL) return; - if((out = fopen(dst, "wb")) == NULL){ + if((out = fopen(dst, "wb")) == NULL) { fclose(in); return; } - do{ + do { r = fread(buffer, 1, sizeof(buffer), in); fwrite(buffer, 1, r, out); - }while(r == sizeof(buffer)); + } while(r == sizeof(buffer)); fclose(in); fclose(out); diff --git a/src/string.c b/src/string.c index 0a603a7..a2753a6 100644 --- a/src/string.c +++ b/src/string.c @@ -3,7 +3,7 @@ #include #include -char* MDEStringDuplicate(const char* src){ +char* MDEStringDuplicate(const char* src) { char* s = malloc(strlen(src) + 1); strcpy(s, src); diff --git a/src/users.c b/src/users.c index 8562d3e..064f1d4 100644 --- a/src/users.c +++ b/src/users.c @@ -3,11 +3,11 @@ #include -void MDEUsersList(void(*call)(const char* name, void* user), void* user){ +void MDEUsersList(void (*call)(const char* name, void* user), void* user) { struct passwd* pwd; setpwent(); - while((pwd = getpwent()) != NULL){ + while((pwd = getpwent()) != NULL) { char* dir; char* shell; @@ -26,7 +26,7 @@ void MDEUsersList(void(*call)(const char* name, void* user), void* user){ shell++; if(strcmp(shell, "nologin") == 0) continue; - + dir = strrchr(pwd->pw_dir, '/'); if(dir == NULL) break; dir++;