diag-ether-format-security.patch

   1 --- diag-ether/3c5x9setup.c.formatsec   2013-02-05 18:41:15.238041747 +0100
   2 +++ diag-ether/3c5x9setup.c     2013-02-05 18:42:20.777685898 +0100
   3 @@ -238,12 +238,12 @@ main(int argc, char **argv)
   4                         errflag++;
   5                 }
   6         if (errflag) {
   7 -               fprintf(stderr, usage_msg);
   8 +               fputs(usage_msg, stderr);
   9                 return 3;
  10         }
  11
  12         if (verbose || show_version)
  13 -               printf(version_msg);
  14 +               fputs(version_msg, stdout);
  15
  16         if (ioperm(port_base, 16, 1) < 0) {
  17                 perror("3c5x9setup: ioperm()");
  18 @@ -286,7 +286,7 @@ main(int argc, char **argv)
  19                 if (last_intr != 255)
  20                         printf("  An interrupt occured only %d ticks ago!\n", last_intr);
  21                 if (saved_window & 0x00ff)
  22 -                       printf(intrs_pending_msg);
  23 +                       fputs(intrs_pending_msg, stdout);
  24                 return 1;
  25         }
  26
  27 --- diag-ether/alta-diag.c.formatsec    2013-02-05 18:00:15.044098691 +0100
  28 +++ diag-ether/alta-diag.c      2013-02-05 18:01:46.465660186 +0100
  29 @@ -234,12 +234,12 @@ main(int argc, char **argv)
  30                         errflag++;
  31                 }
  32         if (errflag) {
  33 -               fprintf(stderr, usage_msg);
  34 +               fputs(usage_msg, stderr);
  35                 return 3;
  36         }
  37
  38         if (verbose || show_version)
  39 -               printf(version_msg);
  40 +               fputs(version_msg, stdout);
  41
  42         if (chip_type < 0
  43                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
  44 @@ -327,11 +327,11 @@ static int scan_proc_bus_pci(int card_nu
  45                                            card_cnt, pcidev_tbl[chip_idx].part_name,
  46                                            port_base);
  47                                 if (irq == 0  || irq == 255)
  48 -                                       printf(bogus_irq);
  49 +                                       fputs(bogus_irq, stdout);
  50                                 if (port_base)
  51                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
  52                                 else
  53 -                                       printf(bogus_iobase);
  54 +                                       fputs(bogus_iobase, stdout);
  55                                 break;
  56                         }
  57                 }
  58 @@ -415,7 +415,7 @@ static int scan_proc_pci(int card_num)
  59                                                         pcidev_tbl[chip_idx].diag_func
  60                                                                 (vendor_id, device_id, port_base, chip_idx);
  61                                                 else
  62 -                                                       printf(bogus_iobase);
  63 +                                                       fputs(bogus_iobase, stdout);
  64                                         }
  65                                 }
  66                         }
  67 --- diag-ether/diag-example.c.formatsec 2013-02-05 20:35:48.034672457 +0100
  68 +++ diag-ether/diag-example.c   2013-02-05 20:36:45.577694053 +0100
  69 @@ -249,12 +249,12 @@ main(int argc, char **argv)
  70                         errflag++;
  71                 }
  72         if (errflag) {
  73 -               fprintf(stderr, usage_msg);
  74 +               fputs(usage_msg, stderr);
  75                 return 3;
  76         }
  77
  78         if (verbose || show_version)
  79 -               printf(version_msg);
  80 +               fputs(version_msg, stdout);
  81
  82         if (chip_type < 0
  83                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
  84 @@ -342,11 +342,11 @@ static int scan_proc_bus_pci(int card_nu
  85                                            card_cnt, pcidev_tbl[chip_idx].part_name,
  86                                            port_base);
  87                                 if (irq == 0  || irq == 255)
  88 -                                       printf(bogus_irq);
  89 +                                       fputs(bogus_irq, stdout);
  90                                 if (port_base)
  91                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
  92                                 else
  93 -                                       printf(bogus_iobase);
  94 +                                       fputs(bogus_iobase, stdout);
  95                                 break;
  96                         }
  97                 }
  98 @@ -430,7 +430,7 @@ static int scan_proc_pci(int card_num)
  99                                                         pcidev_tbl[chip_idx].diag_func
 100                                                                 (vendor_id, device_id, port_base, chip_idx);
 101                                                 else
 102 -                                                       printf(bogus_iobase);
 103 +                                                       fputs(bogus_iobase, stdout);
 104                                         }
 105                                 }
 106                         }
 107 --- diag-ether/eepro100-diag.c.formatsec        2013-02-05 18:02:06.528911548 +0100
 108 +++ diag-ether/eepro100-diag.c  2013-02-05 18:04:36.599952001 +0100
 109 @@ -249,12 +249,12 @@ main(int argc, char **argv)
 110                         errflag++;
 111                 }
 112         if (errflag) {
 113 -               fprintf(stderr, usage_msg);
 114 +               fputs(usage_msg, stderr);
 115                 return 3;
 116         }
 117
 118         if (verbose || show_version)
 119 -               printf(version_msg);
 120 +               fputs(version_msg, stdout);
 121
 122         if (chip_type < 0
 123                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
 124 @@ -342,11 +342,11 @@ static int scan_proc_bus_pci(int card_nu
 125                                            card_cnt, pcidev_tbl[chip_idx].part_name,
 126                                            port_base);
 127                                 if (irq == 0  || irq == 255)
 128 -                                       printf(bogus_irq);
 129 +                                       fputs(bogus_irq, stdout);
 130                                 if (port_base)
 131                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
 132                                 else
 133 -                                       printf(bogus_iobase);
 134 +                                       fputs(bogus_iobase, stdout);
 135                                 break;
 136                         }
 137                 }
 138 @@ -430,7 +430,7 @@ static int scan_proc_pci(int card_num)
 139                                                         pcidev_tbl[chip_idx].diag_func
 140                                                                 (vendor_id, device_id, port_base, chip_idx);
 141                                                 else
 142 -                                                       printf(bogus_iobase);
 143 +                                                       fputs(bogus_iobase, stdout);
 144                                         }
 145                                 }
 146                         }
 147 @@ -999,7 +999,7 @@ static void eepro100_eeprom(unsigned sho
 148                    eeprom[8], eeprom[9]>>8, eeprom[9] & 0xff);
 149         for (i = 0; i < 4; i++)
 150                 if (eeprom[5] & (1<<i))
 151 -                       printf(connectors[i]);
 152 +                       fputs(connectors[i], stdout);
 153         printf("\n  Primary interface chip %s PHY #%d.\n",
 154                    phys[(eeprom[6]>>8)&7], phy0);
 155         if (((eeprom[6]>>8) & 0x3f) == DP83840)
 156 @@ -1009,9 +1009,9 @@ static void eepro100_eeprom(unsigned sho
 157                 printf("    Secondary interface chip %s, PHY %d.\n",
 158                            phys[(eeprom[7]>>8)&7], phy1);
 159         if (eeprom[6] == 0)
 160 -               printf(no_xcvr_msg);
 161 +               fputs(no_xcvr_msg, stdout);
 162         if (eeprom[10] & 0x0002)
 163 -               printf(sleep_mode_msg);
 164 +               fputs(sleep_mode_msg, stdout);
 165
 166         return;
 167  }
 168 --- diag-ether/epic-diag.c.formatsec    2013-02-05 18:04:59.023163858 +0100
 169 +++ diag-ether/epic-diag.c      2013-02-05 18:07:46.768921768 +0100
 170 @@ -190,12 +190,12 @@ main(int argc, char **argv)
 171                         errflag++;
 172                 }
 173         if (errflag) {
 174 -               fprintf(stderr, usage_msg);
 175 +               fputs(usage_msg, stderr);
 176                 return 3;
 177         }
 178
 179         if (verbose || show_version)
 180 -               printf(version_msg);
 181 +               fputs(version_msg, stdout);
 182
 183         if (chip_type < 0
 184                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
 185 @@ -283,11 +283,11 @@ static int scan_proc_bus_pci(int card_nu
 186                                            card_cnt, pcidev_tbl[chip_idx].part_name,
 187                                            port_base);
 188                                 if (irq == 0  || irq == 255)
 189 -                                       printf(bogus_irq);
 190 +                                       fputs(bogus_irq, stdout);
 191                                 if (port_base)
 192                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
 193                                 else
 194 -                                       printf(bogus_iobase);
 195 +                                       fputs(bogus_iobase, stdout);
 196                                 break;
 197                         }
 198                 }
 199 @@ -371,7 +371,7 @@ static int scan_proc_pci(int card_num)
 200                                                         pcidev_tbl[chip_idx].diag_func
 201                                                                 (vendor_id, device_id, port_base, chip_idx);
 202                                                 else
 203 -                                                       printf(bogus_iobase);
 204 +                                                       fputs(bogus_iobase, stdout);
 205                                         }
 206                                 }
 207                         }
 208 --- diag-ether/ether-wake.c.formatsec   2013-02-05 17:52:35.916585998 +0100
 209 +++ diag-ether/ether-wake.c     2013-02-05 17:54:39.669248906 +0100
 210 @@ -135,7 +135,7 @@ int main(int argc, char *argv[])
 211                 case 'D': debug++;                      break;
 212                 case 'i': ifname = optarg;      break;
 213                 case 'p': get_wol_pw(optarg); break;
 214 -               case 'u': printf(usage_msg); return 0;
 215 +               case 'u': fputs(usage_msg, stdout); return 0;
 216                 case 'v': verbose++;            break;
 217                 case 'V': do_version++;         break;
 218                 case '?':
 219 @@ -144,7 +144,7 @@ int main(int argc, char *argv[])
 220         if (verbose || do_version)
 221                 printf("%s\n", version_msg);
 222         if (errflag) {
 223 -               fprintf(stderr, brief_usage_msg);
 224 +               fputs(brief_usage_msg, stderr);
 225                 return 3;
 226         }
 227
 228 --- diag-ether/mii-diag.c.formatsec     2013-02-05 18:49:13.532116482 +0100
 229 +++ diag-ether/mii-diag.c       2013-02-05 20:35:21.244817590 +0100
 230 @@ -205,7 +205,7 @@ main(int argc, char **argv)
 231         }
 232
 233         if (verbose || opt_version)
 234 -               printf(version);
 235 +               fputs(version, stdout);
 236
 237         /* Open a basic socket. */
 238         if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) {
 239 @@ -533,7 +533,7 @@ int show_basic_mii(long ioaddr, int phy_
 240                            bmcr & 0x0100 ? "full":"half");
 241         for (i = 0; i < 9; i++)
 242                 if (bmcr & (0x0080<<i))
 243 -                       printf(bmcr_bits[i]);
 244 +                       fputs(bmcr_bits[i], stdout);
 245
 246         new_bmsr = mdio_read(ioaddr, phy_id, 1);
 247         if ((bmsr & 0x0016) == 0x0004)
 248 --- diag-ether/myson-diag.c.formatsec   2013-02-05 18:28:03.025666073 +0100
 249 +++ diag-ether/myson-diag.c     2013-02-05 18:38:40.142214516 +0100
 250 @@ -238,12 +238,12 @@ main(int argc, char **argv)
 251                         errflag++;
 252                 }
 253         if (errflag) {
 254 -               fprintf(stderr, usage_msg);
 255 +               fputs(usage_msg, stderr);
 256                 return 3;
 257         }
 258
 259         if (verbose || show_version)
 260 -               printf(version_msg);
 261 +               fputs(version_msg, stdout);
 262
 263         if (chip_type < 0
 264                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
 265 @@ -331,11 +331,11 @@ static int scan_proc_bus_pci(int card_nu
 266                                            card_cnt, pcidev_tbl[chip_idx].part_name,
 267                                            port_base);
 268                                 if (irq == 0  || irq == 255)
 269 -                                       printf(bogus_irq);
 270 +                                       fputs(bogus_irq, stdout);
 271                                 if (port_base)
 272                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
 273                                 else
 274 -                                       printf(bogus_iobase);
 275 +                                       fputs(bogus_iobase, stdout);
 276                                 break;
 277                         }
 278                 }
 279 @@ -419,7 +419,7 @@ static int scan_proc_pci(int card_num)
 280                                                         pcidev_tbl[chip_idx].diag_func
 281                                                                 (vendor_id, device_id, port_base, chip_idx);
 282                                                 else
 283 -                                                       printf(bogus_iobase);
 284 +                                                       fputs(bogus_iobase, stdout);
 285                                         }
 286                                 }
 287                         }
 288 @@ -839,7 +839,7 @@ static char davicom_msg[] =
 289  static void myson_eeprom(unsigned short *ee_data)
 290  {
 291         if (ee_data[9] == 0x0103) {
 292 -               printf(davicom_msg);
 293 +               fputs(davicom_msg, stdout);
 294                 printf("  The station address for this adapter may be "
 295                            "'-H 00:C0:B4:%2.2x:%2.2x:%2.2x'\n",
 296                            ee_data[11] >> 8, ee_data[12] & 0xff, ee_data[12] >> 8);
 297 --- diag-ether/natsemi-diag.c.formatsec 2013-02-05 18:39:15.358690399 +0100
 298 +++ diag-ether/natsemi-diag.c   2013-02-05 18:40:24.494982522 +0100
 299 @@ -241,12 +241,12 @@ main(int argc, char **argv)
 300                         errflag++;
 301                 }
 302         if (errflag) {
 303 -               fprintf(stderr, usage_msg);
 304 +               fputs(usage_msg, stderr);
 305                 return 3;
 306         }
 307
 308         if (verbose || show_version)
 309 -               printf(version_msg);
 310 +               fputs(version_msg, stdout);
 311
 312         if (chip_type < 0
 313                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
 314 @@ -334,11 +334,11 @@ static int scan_proc_bus_pci(int card_nu
 315                                            card_cnt, pcidev_tbl[chip_idx].part_name,
 316                                            port_base);
 317                                 if (irq == 0  || irq == 255)
 318 -                                       printf(bogus_irq);
 319 +                                       fputs(bogus_irq, stdout);
 320                                 if (port_base)
 321                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
 322                                 else
 323 -                                       printf(bogus_iobase);
 324 +                                       fputs(bogus_iobase, stdout);
 325                                 break;
 326                         }
 327                 }
 328 @@ -422,7 +422,7 @@ static int scan_proc_pci(int card_num)
 329                                                         pcidev_tbl[chip_idx].diag_func
 330                                                                 (vendor_id, device_id, port_base, chip_idx);
 331                                                 else
 332 -                                                       printf(bogus_iobase);
 333 +                                                       fputs(bogus_iobase, stdout);
 334                                         }
 335                                 }
 336                         }
 337 --- diag-ether/ne2k-pci-diag.c.formatsec        2013-02-05 17:53:04.133099803 +0100
 338 +++ diag-ether/ne2k-pci-diag.c  2013-02-05 17:57:35.138298309 +0100
 339 @@ -191,12 +191,12 @@ main(int argc, char **argv)
 340                         errflag++;
 341                 }
 342         if (errflag) {
 343 -               fprintf(stderr, usage_msg);
 344 +               fputs(usage_msg, stderr);
 345                 return 3;
 346         }
 347
 348         if (verbose || show_version)
 349 -               printf(version_msg);
 350 +               fputs(version_msg, stdout);
 351
 352         if (chip_type < 0
 353                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
 354 @@ -284,11 +284,11 @@ static int scan_proc_bus_pci(int card_nu
 355                                            card_cnt, pcidev_tbl[chip_idx].part_name,
 356                                            port_base);
 357                                 if (irq == 0  || irq == 255)
 358 -                                       printf(bogus_irq);
 359 +                                       fputs(bogus_irq, stdout);
 360                                 if (port_base)
 361                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
 362                                 else
 363 -                                       printf(bogus_iobase);
 364 +                                       fputs(bogus_iobase, stdout);
 365                                 break;
 366                         }
 367                 }
 368 @@ -372,7 +372,7 @@ static int scan_proc_pci(int card_num)
 369                                                         pcidev_tbl[chip_idx].diag_func
 370                                                                 (vendor_id, device_id, port_base, chip_idx);
 371                                                 else
 372 -                                                       printf(bogus_iobase);
 373 +                                                       fputs(bogus_iobase, stdout);
 374                                         }
 375                                 }
 376                         }
 377 @@ -831,12 +831,12 @@ static void do_ne2k_eeprom(long ioaddr,
 378                 return;
 379         } else {
 380                 if (show_eeprom)
 381 -                       printf(unknown_eeprom_message);
 382 +                       fputs(unknown_eeprom_message, stdout);
 383                 return;
 384         }
 385
 386         if (emergency_rewrite  &&  ! (capabilities & (WINBOND_EE)))
 387 -               fprintf(stderr, no_rewrite_msg);
 388 +               fputs(no_rewrite_msg, stderr);
 389         if (emergency_rewrite  &&  ! set_hwaddr)
 390                 fprintf(stderr, "*** Emergency EEPROM rewrite is only valid when you"
 391                                 " also specify a new\n"
 392 --- diag-ether/ns820-diag.c.formatsec   2013-02-05 18:43:09.174090379 +0100
 393 +++ diag-ether/ns820-diag.c     2013-02-05 18:44:33.913631305 +0100
 394 @@ -236,12 +236,12 @@ main(int argc, char **argv)
 395                         errflag++;
 396                 }
 397         if (errflag) {
 398 -               fprintf(stderr, usage_msg);
 399 +               fputs(usage_msg, stderr);
 400                 return 3;
 401         }
 402
 403         if (verbose || show_version)
 404 -               printf(version_msg);
 405 +               fputs(version_msg, stdout);
 406
 407         if (chip_type < 0
 408                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
 409 @@ -329,11 +329,11 @@ static int scan_proc_bus_pci(int card_nu
 410                                            card_cnt, pcidev_tbl[chip_idx].part_name,
 411                                            port_base);
 412                                 if (irq == 0  || irq == 255)
 413 -                                       printf(bogus_irq);
 414 +                                       fputs(bogus_irq, stdout);
 415                                 if (port_base)
 416                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
 417                                 else
 418 -                                       printf(bogus_iobase);
 419 +                                       fputs(bogus_iobase, stdout);
 420                                 break;
 421                         }
 422                 }
 423 @@ -417,7 +417,7 @@ static int scan_proc_pci(int card_num)
 424                                                         pcidev_tbl[chip_idx].diag_func
 425                                                                 (vendor_id, device_id, port_base, chip_idx);
 426                                                 else
 427 -                                                       printf(bogus_iobase);
 428 +                                                       fputs(bogus_iobase, stdout);
 429                                         }
 430                                 }
 431                         }
 432 --- diag-ether/pci-config.c.formatsec   2013-02-05 17:52:43.883209505 +0100
 433 +++ diag-ether/pci-config.c     2013-02-05 17:58:00.174829341 +0100
 434 @@ -150,7 +150,7 @@ int main(int argc, char **argv)
 435         }
 436
 437         if (verbose)
 438 -               printf(version_msg);
 439 +               fputs(version_msg, stdout);
 440
 441         /* Get access to all of I/O space. */
 442         if (iopl(3) < 0) {
 443 --- diag-ether/pcnet-diag.c.formatsec   2013-02-05 18:43:20.490695695 +0100
 444 +++ diag-ether/pcnet-diag.c     2013-02-05 18:45:39.963273483 +0100
 445 @@ -199,12 +199,12 @@ main(int argc, char **argv)
 446                         errflag++;
 447                 }
 448         if (errflag) {
 449 -               fprintf(stderr, usage_msg);
 450 +               fputs(usage_msg, stderr);
 451                 return 3;
 452         }
 453
 454         if (verbose || show_version)
 455 -               printf(version_msg);
 456 +               fputs(version_msg, stdout);
 457
 458         if (chip_type < 0
 459                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
 460 @@ -291,11 +291,11 @@ static int scan_proc_bus_pci(int card_nu
 461                                            card_cnt, pcidev_tbl[chip_idx].part_name,
 462                                            port_base);
 463                                 if (irq == 0  || irq == 255)
 464 -                                       printf(bogus_irq);
 465 +                                       fputs(bogus_irq, stdout);
 466                                 if (port_base)
 467                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
 468                                 else
 469 -                                       printf(bogus_iobase);
 470 +                                       fputs(bogus_iobase, stdout);
 471                                 break;
 472                         }
 473                 }
 474 @@ -379,7 +379,7 @@ static int scan_proc_pci(int card_num)
 475                                                         pcidev_tbl[chip_idx].diag_func
 476                                                                 (vendor_id, device_id, port_base, chip_idx);
 477                                                 else
 478 -                                                       printf(bogus_iobase);
 479 +                                                       fputs(bogus_iobase, stdout);
 480                                         }
 481                                 }
 482                         }
 483 --- diag-ether/rtl8139-diag.c.formatsec 2013-02-05 18:46:13.223093299 +0100
 484 +++ diag-ether/rtl8139-diag.c   2013-02-05 18:47:10.689448644 +0100
 485 @@ -260,12 +260,12 @@ main(int argc, char **argv)
 486                         errflag++;
 487                 }
 488         if (errflag) {
 489 -               fprintf(stderr, usage_msg);
 490 +               fputs(usage_msg, stderr);
 491                 return 3;
 492         }
 493
 494         if (verbose || show_version)
 495 -               printf(version_msg);
 496 +               fputs(version_msg, stdout);
 497
 498         if (chip_type < 0
 499                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
 500 @@ -353,11 +353,11 @@ static int scan_proc_bus_pci(int card_nu
 501                                            card_cnt, pcidev_tbl[chip_idx].part_name,
 502                                            port_base);
 503                                 if (irq == 0  || irq == 255)
 504 -                                       printf(bogus_irq);
 505 +                                       fputs(bogus_irq, stdout);
 506                                 if (port_base)
 507                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
 508                                 else
 509 -                                       printf(bogus_iobase);
 510 +                                       fputs(bogus_iobase, stdout);
 511                                 break;
 512                         }
 513                 }
 514 @@ -441,7 +441,7 @@ static int scan_proc_pci(int card_num)
 515                                                         pcidev_tbl[chip_idx].diag_func
 516                                                                 (vendor_id, device_id, port_base, chip_idx);
 517                                                 else
 518 -                                                       printf(bogus_iobase);
 519 +                                                       fputs(bogus_iobase, stdout);
 520                                         }
 521                                 }
 522                         }
 523 --- diag-ether/starfire-diag.c.formatsec        2013-02-05 18:47:39.605958657 +0100
 524 +++ diag-ether/starfire-diag.c  2013-02-05 18:48:47.485590921 +0100
 525 @@ -193,12 +193,12 @@ main(int argc, char **argv)
 526                         errflag++;
 527                 }
 528         if (errflag) {
 529 -               fprintf(stderr, usage_msg);
 530 +               fputs(usage_msg, stderr);
 531                 return 3;
 532         }
 533
 534         if (verbose || show_version)
 535 -               printf(version_msg);
 536 +               fputs(version_msg, stdout);
 537
 538         if (chip_type < 0
 539                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
 540 @@ -284,11 +284,11 @@ static int scan_proc_bus_pci(int card_nu
 541                                            card_cnt, pcidev_tbl[chip_idx].part_name,
 542                                            port_base);
 543                                 if (irq == 0  || irq == 255)
 544 -                                       printf(bogus_irq);
 545 +                                       fputs(bogus_irq, stdout);
 546                                 if (port_base)
 547                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
 548                                 else
 549 -                                       printf(bogus_iobase);
 550 +                                       fputs(bogus_iobase, stdout);
 551                                 break;
 552                         }
 553                 }
 554 @@ -371,7 +371,7 @@ static int scan_proc_pci(int card_num)
 555                                                         pcidev_tbl[chip_idx].diag_func
 556                                                                 (vendor_id, device_id, port_base, chip_idx);
 557                                                 else
 558 -                                                       printf(bogus_iobase);
 559 +                                                       fputs(bogus_iobase, stdout);
 560                                         }
 561                                 }
 562                         }
 563 --- diag-ether/tulip-diag.c.formatsec   2013-02-05 20:26:21.067743981 +0100
 564 +++ diag-ether/tulip-diag.c     2013-02-05 20:27:44.723957443 +0100
 565 @@ -308,12 +308,12 @@ main(int argc, char **argv)
 566                         errflag++;
 567                 }
 568         if (errflag) {
 569 -               fprintf(stderr, usage_msg);
 570 +               fputs(usage_msg, stderr);
 571                 return 3;
 572         }
 573
 574         if (verbose || show_version)
 575 -               printf(version_msg);
 576 +               fputs(version_msg, stdout);
 577
 578         if (chip_type < 0
 579                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
 580 @@ -401,11 +401,11 @@ static int scan_proc_bus_pci(int card_nu
 581                                            card_cnt, pcidev_tbl[chip_idx].part_name,
 582                                            port_base);
 583                                 if (irq == 0  || irq == 255)
 584 -                                       printf(bogus_irq);
 585 +                                       fputs(bogus_irq, stdout);
 586                                 if (port_base)
 587                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
 588                                 else
 589 -                                       printf(bogus_iobase);
 590 +                                       fputs(bogus_iobase, stdout);
 591                                 break;
 592                         }
 593                 }
 594 @@ -489,7 +489,7 @@ static int scan_proc_pci(int card_num)
 595                                                         pcidev_tbl[chip_idx].diag_func
 596                                                                 (vendor_id, device_id, port_base, chip_idx);
 597                                                 else
 598 -                                                       printf(bogus_iobase);
 599 +                                                       fputs(bogus_iobase, stdout);
 600                                         }
 601                                 }
 602                         }
 603 --- diag-ether/vortex-diag.c.formatsec  2013-02-05 20:27:58.147218056 +0100
 604 +++ diag-ether/vortex-diag.c    2013-02-05 20:29:32.546706650 +0100
 605 @@ -315,12 +315,12 @@ main(int argc, char **argv)
 606                         errflag++;
 607                 }
 608         if (errflag) {
 609 -               fprintf(stderr, usage_msg);
 610 +               fputs(usage_msg, stderr);
 611                 return 3;
 612         }
 613
 614         if (verbose || show_version)
 615 -               printf(version_msg);
 616 +               fputs(version_msg, stdout);
 617
 618         if (chip_type < 0
 619                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
 620 @@ -408,11 +408,11 @@ static int scan_proc_bus_pci(int card_nu
 621                                            card_cnt, pcidev_tbl[chip_idx].part_name,
 622                                            port_base);
 623                                 if (irq == 0  || irq == 255)
 624 -                                       printf(bogus_irq);
 625 +                                       fputs(bogus_irq, stdout);
 626                                 if (port_base)
 627                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
 628                                 else
 629 -                                       printf(bogus_iobase);
 630 +                                       fputs(bogus_iobase, stdout);
 631                                 break;
 632                         }
 633                 }
 634 @@ -496,7 +496,7 @@ static int scan_proc_pci(int card_num)
 635                                                         pcidev_tbl[chip_idx].diag_func
 636                                                                 (vendor_id, device_id, port_base, chip_idx);
 637                                                 else
 638 -                                                       printf(bogus_iobase);
 639 +                                                       fputs(bogus_iobase, stdout);
 640                                         }
 641                                 }
 642                         }
 643 --- diag-ether/winbond-diag.c.formatsec 2013-02-05 20:30:02.893208915 +0100
 644 +++ diag-ether/winbond-diag.c   2013-02-05 20:31:08.916184572 +0100
 645 @@ -238,12 +238,12 @@ main(int argc, char **argv)
 646                         errflag++;
 647                 }
 648         if (errflag) {
 649 -               fprintf(stderr, usage_msg);
 650 +               fputs(usage_msg, stderr);
 651                 return 3;
 652         }
 653
 654         if (verbose || show_version)
 655 -               printf(version_msg);
 656 +               fputs(version_msg, stdout);
 657
 658         if (chip_type < 0
 659                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
 660 @@ -331,11 +331,11 @@ static int scan_proc_bus_pci(int card_nu
 661                                            card_cnt, pcidev_tbl[chip_idx].part_name,
 662                                            port_base);
 663                                 if (irq == 0  || irq == 255)
 664 -                                       printf(bogus_irq);
 665 +                                       fputs(bogus_irq, stdout);
 666                                 if (port_base)
 667                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
 668                                 else
 669 -                                       printf(bogus_iobase);
 670 +                                       fputs(bogus_iobase, stdout);
 671                                 break;
 672                         }
 673                 }
 674 @@ -419,7 +419,7 @@ static int scan_proc_pci(int card_num)
 675                                                         pcidev_tbl[chip_idx].diag_func
 676                                                                 (vendor_id, device_id, port_base, chip_idx);
 677                                                 else
 678 -                                                       printf(bogus_iobase);
 679 +                                                       fputs(bogus_iobase, stdout);
 680                                         }
 681                                 }
 682                         }
 683 --- diag-ether/yellowfin-diag.c.formatsec       2013-02-05 20:32:05.379212019 +0100
 684 +++ diag-ether/yellowfin-diag.c 2013-02-05 20:33:00.022249325 +0100
 685 @@ -192,12 +192,12 @@ main(int argc, char **argv)
 686                         errflag++;
 687                 }
 688         if (errflag) {
 689 -               fprintf(stderr, usage_msg);
 690 +               fputs(usage_msg, stderr);
 691                 return 3;
 692         }
 693
 694         if (verbose || show_version)
 695 -               printf(version_msg);
 696 +               fputs(version_msg, stdout);
 697
 698         if (chip_type < 0
 699                 || chip_type >= sizeof(pcidev_tbl)/sizeof(pcidev_tbl[0]) - 1) {
 700 @@ -283,11 +283,11 @@ static int scan_proc_bus_pci(int card_nu
 701                                            card_cnt, pcidev_tbl[chip_idx].part_name,
 702                                            port_base);
 703                                 if (irq == 0  || irq == 255)
 704 -                                       printf(bogus_irq);
 705 +                                       fputs(bogus_irq, stdout);
 706                                 if (port_base)
 707                                         pcidev_tbl[chip_idx].diag_func(0,0,port_base, i);
 708                                 else
 709 -                                       printf(bogus_iobase);
 710 +                                       fputs(bogus_iobase, stdout);
 711                                 break;
 712                         }
 713                 }
 714 @@ -370,7 +370,7 @@ static int scan_proc_pci(int card_num)
 715                                                         pcidev_tbl[chip_idx].diag_func
 716                                                                 (vendor_id, device_id, port_base, chip_idx);
 717                                                 else
 718 -                                                       printf(bogus_iobase);
 719 +                                                       fputs(bogus_iobase, stdout);
 720                                         }
 721                                 }
 722                         }