~ubuntu-branches/ubuntu/karmic/file-roller/karmic

« back to all changes in this revision

Viewing changes to src/fr-command-rar.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2009-04-14 09:53:33 UTC
  • mfrom: (1.2.59 upstream)
  • Revision ID: james.westby@ubuntu.com-20090414095333-d626n6h12gor3fv3
Tags: 2.26.1-0ubuntu1
New upstream version

Show diffs side-by-side

added added

removed removed

Lines of Context:
572
572
                fr_process_begin_command (comm->process, "unrar");
573
573
 
574
574
        fr_process_add_arg (comm->process, "x");
 
575
        
 
576
        /* keep broken extracted files */
 
577
        fr_process_add_arg (comm->process, "-kb");
575
578
 
576
579
        if (overwrite)
577
580
                fr_process_add_arg (comm->process, "-o+");
646
649
        if (error->type != FR_PROC_ERROR_COMMAND_ERROR)
647
650
                return;
648
651
 
649
 
        if (error->status == 3)
 
652
        /*if (error->status == 3)
650
653
                error->type = FR_PROC_ERROR_ASK_PASSWORD;
651
 
        else if (error->status <= 1)
 
654
        else */
 
655
        if (error->status <= 1)
652
656
                error->type = FR_PROC_ERROR_NONE;
653
657
 
654
658
        for (scan = g_list_last (comm->process->err.raw); scan; scan = scan->prev) {
659
663
                        break;
660
664
                }
661
665
 
 
666
                if (strncmp (line, "Unexpected end of archive", 25) == 0) {
 
667
                        /* FIXME: handle this type of errors at a higher level when the freeze is over. */
 
668
                }
 
669
 
662
670
                if (strncmp (line, "Cannot find volume", 18) == 0) {
663
671
                        char *volume_filename;
664
672