RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-19 20:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: tools: add function read_line_to_trash() to read a line of a file

Browse Source 
This function takes on input a printf format for the file name, making
it particularly suitable for /proc or /sys entries which take a lot of
numbers. It also automatically trims the trailing CR and/or LF chars.
This commit is contained in:
Willy Tarreau 2023-07-06 18:31:53 +02:00
parent c5c1ea6930
commit 3c3261c676
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/tools.h
View File

@ -908,6 +908,7 @@ int my_unsetenv(const char *name);
*/
char *env_expand(char *in);
uint32_t parse_line(char *in, char *out, size_t *outlen, char **args, int *nbargs, uint32_t opts, const char **errptr);
int read_line_to_trash(const char *path_fmt, ...);
size_t sanitize_for_printing(char *line, size_t pos, size_t width);
void update_word_fingerprint(uint8_t *fp, const char *word);
void make_word_fingerprint(uint8_t *fp, const char *word);

39
src/tools.c
View File

@ -5820,6 +5820,45 @@ uint32_t parse_line(char *in, char *out, size_t *outlen, char **args, int *nbarg
}
#undef EMIT_CHAR
/* Read the first line of a file from <path> into the trash buffer. The
* trailing CR and LF if any are stripped. Returns 0 on success, with
* trash.data value reflecting the number of bytes returned in the trash,
* otherwise non-zero, typically a positive value on path construction
* failure, or a negative one on I/O error. The trash is always reset
* before proceeding.
*/
int read_line_to_trash(const char *path_fmt, ...)
{
char path[MAXPATHLEN + 1];
va_list args;
FILE *file;
int ret;
chunk_reset(&trash);
va_start(args, path_fmt);
ret = vsnprintf(path, sizeof(path), path_fmt, args);
va_end(args);
if (ret >= sizeof(path))
return ret;
ret = -1;
file = fopen(path, "r");
if (file) {
if (fgets(trash.area, trash.size, file)) {
ret = strlen(trash.area);
while (ret && (trash.area[ret - 1] == '\r' || trash.area[ret - 1] == '\n'))
ret--;
trash.area[ret] = 0;
trash.data = ret;
ret = 0; // success
}
fclose(file);
}
return ret;
}
/* This is used to sanitize an input line that's about to be used for error reporting.
* It will adjust <line> to print approximately <width> chars around <pos>, trying to
* preserve the beginning, with leading or trailing "..." when the line is truncated.