projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into katzj/memory
[collectd.git]
/
src
/
common.c
diff --git
a/src/common.c
b/src/common.c
index
161b4d6
..
81142fd
100644
(file)
--- a/
src/common.c
+++ b/
src/common.c
@@
-1,6
+1,6
@@
/**
* collectd - src/common.c
/**
* collectd - src/common.c
- * Copyright (C) 2005-201
0
Florian octo Forster
+ * Copyright (C) 2005-201
4
Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-418,34
+418,36
@@
size_t strstripnewline (char *buffer)
return (buffer_len);
} /* size_t strstripnewline */
return (buffer_len);
} /* size_t strstripnewline */
-int escape_slashes (char *buf
, int buf_len
)
+int escape_slashes (char *buf
fer, size_t buffer_size
)
{
int i;
{
int i;
+ size_t buffer_len;
- if (strcmp (buf, "/") == 0)
- {
- if (buf_len < 5)
- return (-1);
+ buffer_len = strlen (buffer);
- strncpy (buf, "root", buf_len);
+ if (buffer_len <= 1)
+ {
+ if (strcmp ("/", buffer) == 0)
+ {
+ if (buffer_size < 5)
+ return (-1);
+ sstrncpy (buffer, "root", buffer_size);
+ }
return (0);
}
return (0);
}
- if (buf_len <= 1)
- return (0);
-
/* Move one to the left */
/* Move one to the left */
- if (buf[0] == '/')
- memmove (buf, buf + 1, buf_len - 1);
+ if (buffer[0] == '/')
+ {
+ memmove (buffer, buffer + 1, buffer_len);
+ buffer_len--;
+ }
- for (i = 0; i < buf_len - 1; i++)
+ for (i = 0; i < buf
fer
_len - 1; i++)
{
{
- if (buf[i] == '\0')
- break;
- else if (buf[i] == '/')
- buf[i] = '_';
+ if (buffer[i] == '/')
+ buffer[i] = '_';
}
}
- buf[i] = '\0';
return (0);
} /* int escape_slashes */
return (0);
} /* int escape_slashes */