void *malloc_chk(size_t size, const char *tag)
{
- void *p;
+ void *p = NULL;
if((p = malloc(size)) == NULL) {
fprintf(stderr, "%s: cannot allocate memory\n", tag);
return memset(p, 0, size);
}
-void *calloc_chk(size_t nmemb, size_t size, char *tag)
+void *calloc_chk(size_t nmemb, size_t size, const char *tag)
{
- void *p;
+ void *p = NULL;
if((p = calloc(nmemb, size)) == NULL) {
fprintf(stderr, "%s: cannot allocate memory\n", tag);
return p;
}
-char *strdup_chk(const char *s, char *tag)
+char *strdup_chk(const char *s, const char *tag)
{
assert(s != NULL);
- char *t;
+ char *t = NULL;
t = malloc_chk(strlen(s) + 1, tag);
strcpy(t, s);
return t;
}
-char *strndup_chk(const char *s, size_t len, char *tag)
+char *strndup_chk(const char *s, size_t len, const char *tag)
{
assert(s != NULL);
- char *t;
+ char *t = NULL;
- t = malloc_chk(len + 1, tag);
- strncpy(t, s, len);
- t[len] = '\0';
+ if(len < strlen(s)) {
+ t = malloc_chk(len + 1, tag);
+ strncpy(t, s, len);
+ t[len] = '\0';
+ } else {
+ t = strdup_chk(s, tag);
+ }
return t;
}
+
+char *strip_end(char *s)
+{
+ int i;
+ i = strlen(s) - 1;
+ while(i > 0 && (s[i] == '\n' || s[i] == ' ' || s[i] == '\t')) {
+ s[i--] = '\0';
+ }
+ return s;
+}
+
+char *strip_casl2_comment(char *s)
+{
+ int i;
+ bool quoting = false;
+
+ for(i = 0; s[i]; i++) {
+ /* 「'」で囲まれた文字列の場合。「''」は無視 */
+ if(s[i] == '\'' && s[i+1] != '\'' && (quoting == false || s[i-1] != '\'')) {
+ quoting = !quoting;
+ /* 「'」で囲まれた文字列でない場合、文字列末尾の「;」以降を削除 */
+ } else if(quoting == false && s[i] == ';') {
+ s[i] = '\0';
+ break;
+ }
+ }
+ return s;
+}