Author: nkinder
Update of /cvs/dirsec/setuputil/installer/unix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16325/installer/unix
Modified Files:
uxres.cc
Log Message:
176156 - Allow all installer strings to be overridden by resource file settings
Index: uxres.cc
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/unix/uxres.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- uxres.cc 29 Jul 2005 22:16:32 -0000 1.1.1.1
+++ uxres.cc 20 Dec 2005 00:08:09 -0000 1.2
@@ -72,11 +72,27 @@
for (i = 0, j = 0; i < len; i++, j++)
{
- // Take care of backslash n for now.
- if (value[i] == ' ' && value[i+1] == '\\' &&
value[i+2] == 'n')
+ // Surrounding quotes should be dropped
+ if ( value[i] == '"' )
{
- new_value[j] = '\n';
- i += 2;
+ // Decrement j so we don't get an extra space
+ j--;
+ continue;
+ }
+
+ // Take care of newlines and escaped quotes
+ if ( value[i] == '\\' )
+ {
+ if ( value[i+1] == 'n' )
+ {
+ new_value[j] = '\n';
+ i++;
+ }
+ else if ( value[i+1] == '"' )
+ {
+ new_value[j] = value[i+1];
+ i++;
+ }
}
else
{
Show replies by date