/[jscoverage]/trunk/util.c
ViewVC logotype

Diff of /trunk/util.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 370 by siliconforks, Mon Oct 27 20:34:27 2008 UTC revision 448 by siliconforks, Tue Aug 11 17:16:32 2009 UTC
# Line 1  Line 1 
1  /*  /*
2      util.c - general purpose utility routines      util.c - general purpose utility routines
3      Copyright (C) 2007, 2008 siliconforks.com      Copyright (C) 2007, 2008, 2009 siliconforks.com
4    
5      This program is free software; you can redistribute it and/or modify      This program is free software; you can redistribute it and/or modify
6      it under the terms of the GNU General Public License as published by      it under the terms of the GNU General Public License as published by
# Line 71  Line 71 
71    exit(EXIT_FAILURE);    exit(EXIT_FAILURE);
72  }  }
73    
74    void warn_source(const char * source_file, unsigned int line_number, const char * format, ...) {
75      fprintf(stderr, "%s:%s:%u: ", program, source_file, line_number);
76      va_list ap;
77      va_start(ap, format);
78      vfprintf(stderr, format, ap);
79      va_end(ap);
80      fputc('\n', stderr);
81    }
82    
83  void version(void) {  void version(void) {
84    printf("%s %s\n", program, VERSION);    printf("%s %s\n", program, VERSION);
85    printf("Character encoding support: ");    printf("Character encoding support: ");
# Line 257  Line 266 
266    return strcmp(string + string_length - suffix_length, suffix) == 0;    return strcmp(string + string_length - suffix_length, suffix) == 0;
267  }  }
268    
269    static int is_slash(char c) {
270    #ifdef _WIN32
271      return c == '/' || c == '\\';
272    #else
273      return c == '/';
274    #endif
275    }
276    
277  char * make_path(const char * parent, const char * relative_path) {  char * make_path(const char * parent, const char * relative_path) {
278    size_t parent_length = strlen(parent);    size_t parent_length = strlen(parent);
279    size_t relative_path_length = strlen(relative_path);    size_t relative_path_length = strlen(relative_path);
280      assert(parent_length > 0);
281      assert(relative_path_length > 0);
282    size_t result_length = addst(parent_length, relative_path_length);    size_t result_length = addst(parent_length, relative_path_length);
283    result_length = addst(result_length, 2);    int parent_ends_with_slash = is_slash(parent[parent_length - 1]);
284      if (parent_ends_with_slash) {
285        result_length = addst(result_length, 1);
286      }
287      else {
288        result_length = addst(result_length, 2);
289      }
290    char * result = xmalloc(result_length);    char * result = xmalloc(result_length);
291    strcpy(result, parent);    strcpy(result, parent);
292    result[parent_length] = '/';    char * p = result + parent_length;
293    strcpy(result + parent_length + 1, relative_path);    if (! parent_ends_with_slash) {
294        *p = '/';
295        ++p;
296      }
297      strcpy(p, relative_path);
298    return result;    return result;
299  }  }
300    

Legend:
Removed from v.370  
changed lines
  Added in v.448

  ViewVC Help
Powered by ViewVC 1.1.24