← Back to branch summary

~ubuntu-branches/ubuntu/breezy/unrar-nonfree/breezy

« back to all changes in this revision

Viewing changes to list.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Chris Anderson
  • Date: 2004-12-01 02:22:56 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20041201022256-c3pj5nufp88tdyw6
Tags: 3.4.3-1
http://bugs.debian.org/280263
* New upstream release 
* Applied Ulf Harnhammar's patch to solve overflows when $HOME was too
  large (closes: #280263).

Show diffs side-by-side

added added

removed removed

Lines of Context:
list.cpp
76
76
                TotalPackSize+=Arc.NewLhd.FullPackSize;
77
77
                if (Technical)
78
78
                  ListSymLink(Arc);
 
79
#ifndef SFX_MODULE
 
80
                if (Verbose)
 
81
                  Arc.ViewFileComment();
 
82
#endif
79
83
              }
80
84
              break;
81
85
#ifndef SFX_MODULE
107
111
            char PackSizeText[20];
108
112
            itoa(TotalPackSize,PackSizeText);
109
113
        
110
 
            mprintf("\n%5lu %16s %8s %3d%%\n",FileCount,UnpSizeText,
 
114
            mprintf("\n%5lu %16s %8s %3d%%",FileCount,UnpSizeText,
111
115
                    PackSizeText,ToPercent(TotalPackSize,TotalUnpSize));
112
116
            SumFileCount+=FileCount;
113
117
            SumUnpSize+=TotalUnpSize;
114
118
            SumPackSize+=TotalPackSize;
 
119
#ifndef SFX_MODULE
 
120
            if (Arc.EndArcHead.Flags & EARC_VOLNUMBER)
 
121
            {
 
122
              mprintf("       ");
 
123
              mprintf(St(MVolumeNumber),Arc.EndArcHead.VolNumber+1);
 
124
            }
 
125
#endif
 
126
            mprintf("\n");
115
127
          }
116
128
          else
117
129
            mprintf(St(MListNoFiles));
177
189
 
178
190
#ifdef UNICODE_SUPPORTED
179
191
  char ConvertedName[NM];
180
 
  if ((hd.Flags & LHD_UNICODE)!=0 && *hd.FileNameW!=0)
 
192
  if ((hd.Flags & LHD_UNICODE)!=0 && *hd.FileNameW!=0 && UnicodeEnabled())
181
193
  {
182
194
    WideToChar(hd.FileNameW,ConvertedName);
183
195
    Name=ConvertedName;
196
208
    mprintf("%-12s",PointToName(Name));
197
209
 
198
210
  char UnpSizeText[20],PackSizeText[20];
199
 
  itoa(hd.FullUnpSize,UnpSizeText);
 
211
  if (hd.FullUnpSize==INT64MAX)
 
212
    strcpy(UnpSizeText,"?");
 
213
  else
 
214
    itoa(hd.FullUnpSize,UnpSizeText);
200
215
  itoa(hd.FullPackSize,PackSizeText);
201
216
 
202
217
  mprintf(" %8s %8s ",UnpSizeText,PackSizeText);
261
276
    case HOST_OS2:
262
277
    case HOST_WIN32:
263
278
    case HOST_MACOS:
264
 
      mprintf("  %c%c%c%c%c%c  ",
 
279
      mprintf(" %c%c%c%c%c%c%c  ",
265
280
              (A & 0x08) ? 'V' : '.',
266
281
              (A & 0x10) ? 'D' : '.',
267
282
              (A & 0x01) ? 'R' : '.',
268
283
              (A & 0x02) ? 'H' : '.',
269
284
              (A & 0x04) ? 'S' : '.',
270
 
              (A & 0x20) ? 'A' : '.');
 
285
              (A & 0x20) ? 'A' : '.',
 
286
              (A & 0x800) ? 'C' : '.');
271
287
      break;
272
288
    case HOST_UNIX:
273
289
    case HOST_BEOS: