From d6a27f15acd08e99841595cece2b3e3e8045491a Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期二, 13 十月 2020 18:15:55 +0800 Subject: [PATCH] update --- include/usgcommon/usg_common.h | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/include/usgcommon/usg_common.h b/include/usgcommon/usg_common.h index ad509ed..1cf17c4 100644 --- a/include/usgcommon/usg_common.h +++ b/include/usgcommon/usg_common.h @@ -22,6 +22,7 @@ #include <sched.h> #include <sys/time.h> +#include <sys/syscall.h> #include <sys/types.h> #include <sys/wait.h> #include <sys/stat.h> @@ -45,6 +46,7 @@ #include <stdint.h> #include <assert.h> + #ifdef __cplusplus } #endif @@ -59,22 +61,33 @@ #include <fstream> #include <sstream> #include <string> + #include <cstdlib> #include <atomic> #include <algorithm> #include <iomanip> #include <limits> -#include <map> + #include <initializer_list> #include <vector> +#include <map> +#include <set> + +#include <functional> #include <thread> - #endif +#include "usg_typedef.h" #ifdef __cplusplus extern "C" { #endif + +/* Signal wrappers */ +typedef void handler_t(int); +handler_t *Signal(int signum, handler_t *handler); + + /* Our own error-handling functions */ @@ -85,19 +98,26 @@ char *rtrim(char *str, const char *seps); char *trim(char *str, const char *seps); +char * str_join( const char *seperator, const char *first...); +char ** str_split(const char *str, const char *delim, int *arr_len); +char * array_join(char * const arr[], const char *seperator); +char * path_join(const char *path, ...); +// 鍙嶅悜鏌ヨ +char *strstr_r(char *str, char * needle); +// 閫掑綊鍒涘缓鏂囦欢澶� +int mkdir_r(const char *pathname, mode_t mode); + +int mkdiratfd_r(int dirfd, const char *pathname, mode_t mode); +int mkdirat_r(const char * dir, const char *pathname, mode_t mode); + + static inline int -itoa(int num, char *str) +strtoi(int num, char *str) { return sprintf(str, "%d", num); } -static inline int -ftoa(float num, char *str) -{ - return sprintf(str, "%f", num); - -} -- Gitblit v1.8.0