/[public]/psiconv/trunk/lib/psiconv/misc.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/misc.c

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

Revision 171 Revision 196
1/* 1/*
2 parse_aux.c - Part of psiconv, a PSION 5 file formats converter 2 parse_aux.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 1999-2004 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 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 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
28#ifdef DMALLOC 28#ifdef DMALLOC
29#include <dmalloc.h> 29#include <dmalloc.h>
30#endif 30#endif
31 31
32 32
33char *psiconv_make_printable(const char *s) 33char *psiconv_make_printable(const psiconv_config config,
34 const psiconv_string_t input)
34{ 35{
35 int i; 36 int i,len;
36 char *res = malloc(strlen(s) + 1); 37 psiconv_u8 *intermed;
37 if (!res) 38 char *output;
39 int res;
40
41 if ((res = psiconv_unicode_to_chars(config,input,&intermed)))
38 return NULL; 42 return NULL;
43
44 len = 0;
45 while (intermed[len])
46 len++;
47
48 if (!(output = malloc(sizeof(*output) * (len + 1)))) {
49 free(intermed);
50 return NULL;
51 }
52
39 for (i = 0; i < strlen(s); i ++) 53 for (i = 0; i < len; i ++)
40 if (s[i] < 0x20 || s[i] >= 0x7f) 54 if (intermed[i] < 0x20 || intermed[i] >= 0x7f)
41 res[i] = '.'; 55 output[i] = '.';
42 else 56 else
43 res[i] = s[i]; 57 output[i] = intermed[i];
44 res[strlen(s)] = 0; 58 output[i] = 0;
45 return res; 59 free(intermed);
60 return output;
46} 61}
Legend:
Removed from v.171  
changed lines
  Added in v.196
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26