← Back to branch summary

~ubuntu-branches/ubuntu/dapper/file-roller/dapper-updates

« back to all changes in this revision

Viewing changes to src/fr-command-7z.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Holbach
  • Date: 2006-04-11 08:44:59 UTC
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: james.westby@ubuntu.com-20060411084459-9r22188ftese2ev2
Tags: upstream-2.14.1
Import upstream version 2.14.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/fr-command-7z.c
88
88
        char *c;
89
89
        
90
90
        for (c = path; *c != 0; c++)
91
 
                if (*c == '\\')
 
91
                if ((*c == '\\') && (*(c+1) != '\\'))
92
92
                        *c = '/';
93
93
}
94
94
 
95
95
 
 
96
static char*
 
97
to_dos (const char *path)
 
98
{
 
99
        return str_substitute (path, "/", "\\\\");
 
100
}
 
101
 
 
102
 
96
103
static int
97
104
str_rfind (const char *str, 
98
105
           int         c)
131
138
 
132
139
        fields = split_line (line, 4);
133
140
 
 
141
        if (g_strv_length (fields) < 4) {
 
142
                g_strfreev (fields);
 
143
                file_data_free (fdata);
 
144
                return;
 
145
        }
 
146
 
134
147
        if (fields[2][0] == 'D') { /* skip directories */
135
148
                g_strfreev (fields);
136
149
                file_data_free (fdata);
228
241
        fr_process_add_arg (comm->process, comm->e_filename);
229
242
 
230
243
        for (scan = file_list; scan; scan = scan->next) {
231
 
                char *filename = str_substitute ((char*) scan->data, "/", "\\\\");
 
244
                char *filename = to_dos (scan->data);
232
245
                fr_process_add_arg (comm->process, filename);
233
246
                g_free (filename);
234
247
        }
251
264
        fr_process_add_arg (comm->process, comm->e_filename);
252
265
 
253
266
        for (scan = file_list; scan; scan = scan->next) {
254
 
                char *filename = str_substitute ((char*) scan->data, "/", "\\\\");
 
267
                char *filename = to_dos (scan->data);
255
268
                fr_process_add_arg (comm->process, filename);
256
269
                g_free (filename);
257
270
        }
292
305
        fr_process_add_arg (comm->process, comm->e_filename);
293
306
 
294
307
        for (scan = file_list; scan; scan = scan->next) {
295
 
                char *filename = str_substitute ((char*) scan->data, "/", "\\\\");
 
308
                char *filename = to_dos (scan->data);
296
309
                fr_process_add_arg (comm->process, filename);
297
310
                g_free (filename);
298
311
        }