emulators/xbeeb/patches/patch-af

   1 $NetBSD$
   2
   3 Remove use of non-standard "a" modifier in scanf format.  Under non-Linux
   4 systems it is more likely to just core.
   5
   6 --- src/InfFS.c.orig    2002-01-16 04:46:43.000000000 +1300
   7 +++ src/InfFS.c 2006-06-04 13:36:52.000000000 +1200
   8 @@ -1516,24 +1516,23 @@
   9                         if ( !access ( beebfile, R_OK ) &&
  10                                                 ( cat_fp = fopen ( entry->d_name, "r" ))) {
  11                                 if ( fgets ( buff, 79, cat_fp ) > 0 ) {
  12 +                                       char locked[10];
  13                                         /*
  14                                          * FIX ME
  15                                          * Check for errors from malloc and sscanf
  16                                          */
  17                                         p = malloc ( sizeof ( FileInfoL ));
  18 -                                       sscanf ( buff, "%*s %X %X %as",
  19 -                                               &(p->info.LoadAddress), &(p->info.ExeAddress), &lock );
  20 +                                       locked[0] = '\0';
  21 +                                       sscanf ( buff, "%*s %X %X %9s",
  22 +                                               &(p->info.LoadAddress), &(p->info.ExeAddress), locked);
  23                                         p->info.StartSector = 0;
  24                                         stat ( beebfile, &sb );
  25                                         p->info.FileLength = sb.st_size;
  26 -                                       if ( lock ) {
  27  #ifdef XDFS
  28 -                                               if ( !strncmp ( lock, "Locked", 6 )) {
  29 -                                                       p->info.LockFlag = 'L';
  30 -                                               }
  31 -#endif
  32 -                                               free ( lock );
  33 +                                       if ( !strncmp ( locked, "Locked", 6 )) {
  34 +                                               p->info.LockFlag = 'L';
  35                                         }
  36 +#endif
  37                                         /*
  38                                          * Filenames are right-padded with spaces initially.
  39                                          */