crash-format.patch

   1 --- crash-7.0.1/tools.c.orig    2013-06-17 20:18:36.000000000 +0200
   2 +++ crash-7.0.1/tools.c 2013-07-10 18:18:48.226348270 +0200
   3 @@ -5389,7 +5389,7 @@
   4         pc->flags |= PLEASE_WAIT;
   5
   6          please_wait_len = sprintf(buf, "\rplease wait... (%s)", s);
   7 -       fprintf(fp, buf);
   8 +       fputs(buf, fp);
   9          fflush(fp);
  10  }
  11
  12 --- crash-7.0.1/memory.c.orig   2013-06-17 20:18:36.000000000 +0200
  13 +++ crash-7.0.1/memory.c        2013-07-10 19:36:54.826063658 +0200
  14 @@ -3608,7 +3608,7 @@
  15
  16         if (!(flag & (PHYSADDR|VERIFY_ADDR|PRINT_VMA_STRUCTS|PRINT_SINGLE_VMA)) &&
  17             !DO_REF_SEARCH(ref))
  18 -               fprintf(fp, vma_header);
  19 +               fputs(vma_header, fp);
  20
  21         for (found = FALSE; vma; vma = vm_next) {
  22
  23 @@ -3868,7 +3868,7 @@
  24                 }
  25
  26                 if (display)
  27 -                       fprintf(fp, buf3);
  28 +                       fputs(buf3, fp);
  29
  30                 start += PAGESIZE();
  31         }
  32 @@ -5725,7 +5725,7 @@
  33                 close_tmpfile();
  34
  35                 if (found) {
  36 -                       fprintf(fp, hash_table);
  37 +                       fputs(hash_table, fp);
  38                         fprintf(fp, "%lx\n", searchpage);
  39                         hi->retval = TRUE;
  40                 }
  41 @@ -5829,7 +5829,7 @@
  42                 open_tmpfile();
  43
  44         if (!verbose)
  45 -               fprintf(fp, free_area_hdr1);
  46 +               fputs(free_area_hdr1, fp);
  47
  48                 hq_open();
  49         for (i = 0; i < nr_mem_lists; i++) {
  50 @@ -5838,7 +5838,7 @@
  51                 chunk_size = power(2, i);
  52
  53                 if (verbose)
  54 -                       fprintf(fp, free_area_hdr2);
  55 +                       fputs(free_area_hdr2, fp);
  56
  57                 fprintf(fp, "%3d  ", i);
  58                 sprintf(buf, "%ldk", (chunk_size * PAGESIZE())/1024);
  59 @@ -5924,8 +5924,8 @@
  60         if (found) {
  61                 order--;
  62
  63 -               fprintf(fp, last_free_hdr);
  64 -               fprintf(fp, last_free);
  65 +               fputs(last_free_hdr, fp);
  66 +               fputs(last_free, fp);
  67                 fprintf(fp, "%lx  ", this_addr);
  68                 if (order) {
  69                         switch (fi->memtype)
  70 @@ -6039,12 +6039,12 @@
  71          hq_open();
  72          for (i = sum = found = 0; i < dimension; i++) {
  73                 if (!verbose)
  74 -                       fprintf(fp, free_area_hdr5);
  75 +                       fputs(free_area_hdr5, fp);
  76                         pp = (ulong *)(free_area_buf +
  77                         ((SIZE(free_area_struct)*nr_mem_lists)*i));
  78                 for (j = 0; j < nr_mem_lists; j++) {
  79                          if (verbose)
  80 -                                fprintf(fp, free_area_hdr6);
  81 +                                fputs(free_area_hdr6, fp);
  82
  83                         sprintf(buf, "[%d][%d]", i, j);
  84                         fprintf(fp, "%7s  ", buf);
  85 @@ -6137,7 +6137,7 @@
  86         close_tmpfile();
  87
  88         if (found) {
  89 -               fprintf(fp, last_area_hdr);
  90 +               fputs(last_area_hdr, fp);
  91                 fprintf(fp, "%s\n", last_area);
  92                 fprintf(fp, "%lx  ", this_addr);
  93                  if (order) {
  94 @@ -6433,7 +6433,7 @@
  95                          zone_hdr,
  96                          mkstring(buf1, VADDR_PRLEN, CENTER|LJUST, "MEM_MAP"));
  97                 fprintf(fp, "%s\n", last_zone);
  98 -               fprintf(fp, last_area_hdr);
  99 +               fputs(last_area_hdr, fp);
 100                 fprintf(fp, "%s\n", last_area);
 101                 fprintf(fp, "%lx  ", this_addr);
 102                  if (order) {
 103 @@ -6758,7 +6758,7 @@
 104                          zone_hdr,
 105                          mkstring(buf1, VADDR_PRLEN, CENTER|LJUST, "MEM_MAP"));
 106                 fprintf(fp, "%s\n", last_zone);
 107 -               fprintf(fp, last_area_hdr);
 108 +               fputs(last_area_hdr, fp);
 109                 fprintf(fp, "%s\n", last_area);
 110                 fprintf(fp, "%lx  ", this_addr);
 111                  if (order) {
 112 @@ -6924,7 +6924,7 @@
 113         ld = &list_data;
 114
 115         if (!verbose)
 116 -               fprintf(fp, free_area_hdr4);
 117 +               fputs(free_area_hdr4, fp);
 118
 119         total_free = 0;
 120         flen = MAX(VADDR_PRLEN, strlen("FREE_AREA_STRUCT"));
 121 @@ -6935,7 +6935,7 @@
 122         for (i = 0; i < num; i++,
 123              free_area += SIZE_OPTION(free_area_struct, free_area)) {
 124                 if (verbose)
 125 -                       fprintf(fp, free_area_hdr3);
 126 +                       fputs(free_area_hdr3, fp);
 127                 fprintf(fp, "%3d ", i);
 128                 chunk_size = power(2, i);
 129                 sprintf(buf, "%ldk", (chunk_size * PAGESIZE())/1024);
 130 @@ -6999,7 +6999,7 @@
 131                      j++, free_list += SIZE(list_head)) {
 132
 133                         if (verbose)
 134 -                               fprintf(fp, free_area_hdr3);
 135 +                               fputs(free_area_hdr3, fp);
 136
 137                         fprintf(fp, "%3d ", i);
 138                         chunk_size = power(2, i);
 139 @@ -7109,7 +7109,7 @@
 140                 }
 141         }
 142
 143 -       fprintf(fp, kmeminfo_hdr);
 144 +       fputs(kmeminfo_hdr, fp);
 145         /*
 146          *  Get total RAM based upon how the various versions of si_meminfo()
 147           *  have done it, latest to earliest:
 148 @@ -8697,7 +8697,7 @@
 149
 150         if ((!(si->flags & VERBOSE) || si->reqname) &&
 151              !(si->flags & (ADDRESS_SPECIFIED|GET_SLAB_PAGES)))
 152 -               fprintf(fp, kmem_cache_hdr);
 153 +               fputs(kmem_cache_hdr, fp);
 154
 155         si->addrlist = (ulong *)GETBUF((vt->kmem_max_c_num+1) * sizeof(ulong));
 156         cnt = 0;
 157 @@ -8804,9 +8804,9 @@
 158                                 do_slab_chain(SLAB_WALKTHROUGH, si);
 159
 160                                 if (si->found) {
 161 -                                       fprintf(fp, kmem_cache_hdr);
 162 +                                       fputs(kmem_cache_hdr, fp);
 163                                         DUMP_KMEM_CACHE_INFO_V1();
 164 -                                       fprintf(fp, slab_hdr);
 165 +                                       fputs(slab_hdr, fp);
 166                                         DUMP_SLAB_INFO();
 167
 168                                         switch (si->found)
 169 @@ -8833,14 +8833,14 @@
 170                                                 break;
 171
 172                                         case KMEM_OBJECT_ADDR_FREE:
 173 -                                                fprintf(fp, free_inuse_hdr);
 174 +                                                fputs(free_inuse_hdr, fp);
 175                                                 fprintf(fp, "   %lx\n",
 176                                                         si->container ? si->container :
 177                                                          (ulong)si->spec_addr);
 178                                                 break;
 179
 180                                          case KMEM_OBJECT_ADDR_INUSE:
 181 -                                                fprintf(fp, free_inuse_hdr);
 182 +                                                fputs(free_inuse_hdr, fp);
 183                                                  fprintf(fp, "  [%lx]\n",
 184                                                         si->container ? si->container :
 185                                                          (ulong)si->spec_addr);
 186 @@ -8903,7 +8903,7 @@
 187
 188         if ((!(si->flags & VERBOSE) || si->reqname) &&
 189              !(si->flags & (ADDRESS_SPECIFIED|GET_SLAB_PAGES)))
 190 -               fprintf(fp, kmem_cache_hdr);
 191 +               fputs(kmem_cache_hdr, fp);
 192
 193         si->addrlist = (ulong *)GETBUF((vt->kmem_max_c_num+1) * sizeof(ulong));
 194         si->kmem_bufctl = (int *)GETBUF((vt->kmem_max_c_num+1) * sizeof(int));
 195 @@ -9018,9 +9018,9 @@
 196                         do_slab_chain_percpu_v1(SLAB_WALKTHROUGH, si);
 197
 198                         if (si->found) {
 199 -                               fprintf(fp, kmem_cache_hdr);
 200 +                               fputs(kmem_cache_hdr, fp);
 201                                 DUMP_KMEM_CACHE_INFO_V1();
 202 -                               fprintf(fp, slab_hdr);
 203 +                               fputs(slab_hdr, fp);
 204                                 gather_slab_cached_count(si);
 205                                 DUMP_SLAB_INFO();
 206
 207 @@ -9045,21 +9045,21 @@
 208                                         break;
 209
 210                                 case KMEM_OBJECT_ADDR_FREE:
 211 -                                        fprintf(fp, free_inuse_hdr);
 212 +                                        fputs(free_inuse_hdr, fp);
 213                                         fprintf(fp, "   %lx\n",
 214                                                 si->container ? si->container :
 215                                                 (ulong)si->spec_addr);
 216                                         break;
 217
 218                                  case KMEM_OBJECT_ADDR_INUSE:
 219 -                                        fprintf(fp, free_inuse_hdr);
 220 +                                        fputs(free_inuse_hdr, fp);
 221                                         fprintf(fp, "  [%lx]\n",
 222                                                 si->container ? si->container :
 223                                                 (ulong)si->spec_addr);
 224                                          break;
 225
 226                                  case KMEM_OBJECT_ADDR_CACHED:
 227 -                                        fprintf(fp, free_inuse_hdr);
 228 +                                        fputs(free_inuse_hdr, fp);
 229                                          fprintf(fp,
 230                                             "   %lx  (cpu %d cache)\n",
 231                                                 si->container ? si->container :
 232 @@ -9123,7 +9123,7 @@
 233
 234         if ((!(si->flags & VERBOSE) || si->reqname) &&
 235              !(si->flags & (ADDRESS_SPECIFIED|GET_SLAB_PAGES)))
 236 -               fprintf(fp, kmem_cache_hdr);
 237 +               fputs(kmem_cache_hdr, fp);
 238
 239         si->addrlist = (ulong *)GETBUF((vt->kmem_max_c_num+1) * sizeof(ulong));
 240         si->kmem_bufctl = (int *)GETBUF((vt->kmem_max_c_num+1) * sizeof(int));
 241 @@ -9262,9 +9262,9 @@
 242                                 do_slab_chain_percpu_v2(SLAB_WALKTHROUGH, si);
 243
 244                         if (si->found) {
 245 -                               fprintf(fp, kmem_cache_hdr);
 246 +                               fputs(kmem_cache_hdr, fp);
 247                                 DUMP_KMEM_CACHE_INFO_V2();
 248 -                               fprintf(fp, slab_hdr);
 249 +                               fputs(slab_hdr, fp);
 250                                 gather_slab_cached_count(si);
 251                                 DUMP_SLAB_INFO();
 252
 253 @@ -9289,21 +9289,21 @@
 254                                         break;
 255
 256                                 case KMEM_OBJECT_ADDR_FREE:
 257 -                                        fprintf(fp, free_inuse_hdr);
 258 +                                        fputs(free_inuse_hdr, fp);
 259                                         fprintf(fp, "   %lx\n",
 260                                                 si->container ? si->container :
 261                                                 (ulong)si->spec_addr);
 262                                         break;
 263
 264                                  case KMEM_OBJECT_ADDR_INUSE:
 265 -                                        fprintf(fp, free_inuse_hdr);
 266 +                                        fputs(free_inuse_hdr, fp);
 267                                          fprintf(fp, "  [%lx]\n",
 268                                                 si->container ? si->container :
 269                                                 (ulong)si->spec_addr);
 270                                          break;
 271
 272                                  case KMEM_OBJECT_ADDR_CACHED:
 273 -                                        fprintf(fp, free_inuse_hdr);
 274 +                                        fputs(free_inuse_hdr, fp);
 275                                          fprintf(fp,
 276                                             "   %lx  (cpu %d cache)\n",
 277                                                 si->container ? si->container :
 278 @@ -9311,7 +9311,7 @@
 279                                          break;
 280
 281                                  case KMEM_OBJECT_ADDR_SHARED:
 282 -                                        fprintf(fp, free_inuse_hdr);
 283 +                                        fputs(free_inuse_hdr, fp);
 284                                          fprintf(fp,
 285                                              "   %lx  (shared cache)\n",
 286                                                 si->container ? si->container :
 287 @@ -10422,7 +10422,7 @@
 288         si->s_index = ULONG_PTR(si->slab_buf + OFFSET(kmem_slab_s_s_index));
 289
 290         if (!(si->flags & ADDRESS_SPECIFIED)) {
 291 -               fprintf(fp, slab_hdr);
 292 +               fputs(slab_hdr, fp);
 293                 DUMP_SLAB_INFO();
 294         }
 295
 296 @@ -10474,7 +10474,7 @@
 297         gather_slab_cached_count(si);
 298
 299         if (!(si->flags & ADDRESS_SPECIFIED)) {
 300 -               fprintf(fp, slab_hdr);
 301 +               fputs(slab_hdr, fp);
 302                 DUMP_SLAB_INFO();
 303         }
 304
 305 @@ -10526,7 +10526,7 @@
 306         gather_slab_cached_count(si);
 307
 308         if (!(si->flags & ADDRESS_SPECIFIED)) {
 309 -               fprintf(fp, slab_hdr);
 310 +               fputs(slab_hdr, fp);
 311                 DUMP_SLAB_INFO();
 312         }
 313
 314 @@ -10774,7 +10774,7 @@
 315                  }
 316
 317          if (!(si->flags & ADDRESS_SPECIFIED))
 318 -               fprintf(fp, free_inuse_hdr);
 319 +               fputs(free_inuse_hdr, fp);
 320
 321          /* For on-slab bufctls, c_offset is the distance between the start of
 322           * an obj and its related bufctl.  For off-slab bufctls, c_offset is
 323 @@ -10850,7 +10850,7 @@
 324                  }
 325
 326          if (!(si->flags & ADDRESS_SPECIFIED))
 327 -               fprintf(fp, free_inuse_hdr);
 328 +               fputs(free_inuse_hdr, fp);
 329
 330         for (i = 0, obj = si->s_mem; i < si->c_num; i++, obj += si->size) {
 331                 on_free_list = FALSE;
 332 @@ -13494,7 +13494,7 @@
 333         swap_info = symbol_value("swap_info");
 334
 335         if (swapflags & VERBOSE)
 336 -               fprintf(fp, swap_info_hdr);
 337 +               fputs(swap_info_hdr, fp);
 338
 339         totalswap = totalused = 0;
 340
 341 @@ -15948,7 +15948,7 @@
 342
 343         if (!si->reqname &&
 344              !(si->flags & (ADDRESS_SPECIFIED|GET_SLAB_PAGES)))
 345 -               fprintf(fp, kmem_cache_hdr);
 346 +               fputs(kmem_cache_hdr, fp);
 347
 348         if (si->flags & ADDRESS_SPECIFIED) {
 349                 if ((p1 = is_slab_page(si, kbuf))) {
 350 @@ -15983,7 +15983,7 @@
 351                 if (reqname) {
 352                         if (!STREQ(reqname, buf))
 353                                 continue;
 354 -                       fprintf(fp, kmem_cache_hdr);
 355 +                       fputs(kmem_cache_hdr, fp);
 356                 }
 357                 if (ignore_cache(si, buf)) {
 358                         fprintf(fp, "%lx %-18s [IGNORED]\n",
 359 @@ -16027,7 +16027,7 @@
 360                 } else if (si->flags & VERBOSE) {
 361                         do_kmem_cache_slub(si);
 362                         if (!reqname && ((i+1) < si->cache_count))
 363 -                               fprintf(fp, kmem_cache_hdr);
 364 +                               fputs(kmem_cache_hdr, fp);
 365                 }
 366
 367  next_cache:
 368 --- crash-7.0.1/x86_64.c.orig   2013-06-17 20:18:36.000000000 +0200
 369 +++ crash-7.0.1/x86_64.c        2013-07-10 19:38:10.459391696 +0200
 370 @@ -4679,7 +4679,7 @@
 371
 372         value_to_symstr(addr, locbuf, 0);
 373         if (strlen(locbuf))
 374 -               sprintf(buf, locbuf);
 375 +               strcpy(buf, locbuf);
 376         else {
 377                 sprintf(buf, "%016lx", addr);
 378                 if (kvtop(NULL, addr, &phys, 0)) {
 379 @@ -4745,7 +4745,7 @@
 380                 sprintf(buf1, "0x%lx <%s>\n", value,
 381                         value_to_symstr(value, buf2, output_radix));
 382
 383 -               sprintf(p1, buf1);
 384 +               strcpy(p1, buf1);
 385
 386          } else if (STREQ(argv[argc-2], "callq") &&
 387              hexadecimal(argv[argc-1], 0)) {
 388 @@ -4763,7 +4763,7 @@
 389                                  value_to_symstr(value, buf2, output_radix));
 390                          if (IS_MODULE_VADDR(value) &&
 391                              !strstr(buf2, "+"))
 392 -                                sprintf(p1, buf1);
 393 +                                strcpy(p1, buf1);
 394                  }
 395          }
 396
 397 @@ -7256,7 +7256,7 @@
 398                 strcpy(buf2, buf);
 399
 400                 if (CRASHDEBUG(3))
 401 -                       fprintf(fp, buf2);
 402 +                       fputs(buf2, fp);
 403
 404                 c = parse_line(buf, arglist);
 405
 406 --- crash-7.0.1/va_server.c.orig        2013-06-17 20:18:36.000000000 +0200
 407 +++ crash-7.0.1/va_server.c     2013-07-10 19:38:39.904020687 +0200
 408 @@ -416,7 +416,7 @@
 409         hdr = sizeof(long) == 4 ? memory_dump_hdr_32 : memory_dump_hdr_64;
 410         fmt = sizeof(long) == 4 ? memory_dump_fmt_32 : memory_dump_fmt_64;
 411
 412 -       fprintf(fp, hdr);
 413 +       fputs(hdr, fp);
 414
 415          for (blks = 0, m = vas_map_base->map; m->start_va; m++) {
 416                 fprintf(fp, fmt,
 417 --- crash-7.0.1/symbols.c.orig  2013-06-17 20:18:36.000000000 +0200
 418 +++ crash-7.0.1/symbols.c       2013-07-10 20:09:51.433565338 +0200
 419 @@ -5691,7 +5691,7 @@
 420                                 }
 421                         }
 422                         p1 = strstr(buf1, "=");
 423 -                       fprintf(pc->saved_fp, p1+2);
 424 +                       fputs(p1+2, pc->saved_fp);
 425                 } else
 426                         fprintf(pc->saved_fp, "     %s", buf1);
 427         }
 428 @@ -6042,7 +6042,7 @@
 429                                 if ((flags & SHOW_OFFSET) && whitespace(buf[0]))
 430                                         show_member_offset(sfp, dm, buf);
 431                                 else
 432 -                                        fprintf(sfp, buf);
 433 +                                        fputs(buf, sfp);
 434                         }
 435                 }
 436          }
 437 @@ -6295,7 +6295,7 @@
 438                 p1 = buf;
 439                 if (STRNEQ(buf, "type = "))
 440                         p1 += strlen("type = ");
 441 -               fprintf(pc->saved_fp, p1);
 442 +               fputs(p1, pc->saved_fp);
 443          }
 444
 445         close_tmpfile();
 446 @@ -6453,7 +6453,7 @@
 447                 int firstline;
 448
 449                 if (leader) {
 450 -                       fprintf(pc->saved_fp, buf2);
 451 +                       fputs(buf2, pc->saved_fp);
 452                         fflush(pc->saved_fp);
 453                 }
 454
 455 @@ -6464,7 +6464,7 @@
 456                             (p1 = strstr(buf1, "{")) &&
 457                             !STRNEQ(p1, "{\n")) {
 458                                 *p1 = NULLCHAR;
 459 -                               fprintf(pc->saved_fp, buf1);
 460 +                               fputs(buf1, pc->saved_fp);
 461                                 fprintf(pc->saved_fp, "\n {");
 462                                 print_verbatim(pc->saved_fp, p1+1);
 463                         } else
 464 @@ -7110,7 +7110,7 @@
 465                 sprintf(buf1, *gdb_output_radix == 10 ?  "  [%ld]" : "  [0x%lx]", offset);
 466         sprintf(fmt, "%c%ds", '%', len);
 467         fprintf(ofp, fmt, buf1);
 468 -       fprintf(ofp, &inbuf[3]);
 469 +       fputs(&inbuf[3], ofp);
 470
 471         return TRUE;
 472
 473 @@ -9347,7 +9347,7 @@
 474                                     strstr(buf, " offset_table:"))
 475                                         break;
 476
 477 -                               fprintf(pc->saved_fp, buf);
 478 +                               fputs(buf, pc->saved_fp);
 479                         }
 480                 }
 481                 close_tmpfile();
 482 --- crash-7.0.1/cmdline.c.orig  2013-06-17 20:18:36.000000000 +0200
 483 +++ crash-7.0.1/cmdline.c       2013-07-10 20:10:19.101455093 +0200
 484 @@ -62,7 +62,7 @@
 485
 486         if (!(pc->flags &
 487             (READLINE|SILENT|CMDLINE_IFILE|RCHOME_IFILE|RCLOCAL_IFILE)))
 488 -               fprintf(fp, pc->prompt);
 489 +               fputs(pc->prompt, fp);
 490         fflush(fp);
 491
 492         /*
 493 --- crash-7.0.1/lkcd_common.c.orig      2013-06-17 20:18:36.000000000 +0200
 494 +++ crash-7.0.1/lkcd_common.c   2013-07-10 20:11:00.596622762 +0200
 495 @@ -1325,7 +1325,7 @@
 496          va_end(ap);
 497
 498         if (lkcd->fp)
 499 -               fprintf(lkcd->fp, buf);
 500 +               fputs(buf, lkcd->fp);
 501         else
 502                 console(buf);
 503  }
 504 --- crash-7.0.1/netdump.c.orig  2013-06-17 20:18:36.000000000 +0200
 505 +++ crash-7.0.1/netdump.c       2013-07-10 20:11:35.021477880 +0200
 506 @@ -691,7 +691,7 @@
 507          va_end(ap);
 508
 509          if (nd->ofp)
 510 -                fprintf(nd->ofp, buf);
 511 +                fputs(buf, nd->ofp);
 512          else
 513                  console(buf);
 514  }
 515 --- crash-7.0.1/xendump.c.orig  2013-06-17 20:18:36.000000000 +0200
 516 +++ crash-7.0.1/xendump.c       2013-07-10 20:12:14.856572161 +0200
 517 @@ -1974,9 +1974,9 @@
 518          va_end(ap);
 519
 520          if (xd->ofp)
 521 -                fprintf(xd->ofp, buf);
 522 +                fputs(buf, xd->ofp);
 523          else if (!XENDUMP_VALID() && CRASHDEBUG(7))
 524 -               fprintf(stderr, buf);
 525 +               fputs(buf, stderr);
 526
 527  }
 528
 529 --- crash-7.0.1/filesys.c.orig  2013-06-17 20:18:36.000000000 +0200
 530 +++ crash-7.0.1/filesys.c       2013-07-10 20:23:29.853077499 +0200
 531 @@ -1290,10 +1290,10 @@
 532                                                 namespace_context);
 533                                 } else {
 534                                         if (!(pc->curcmd_flags & HEADER_PRINTED)) {
 535 -                                               fprintf(fp, mount_hdr);
 536 +                                               fputs(mount_hdr, fp);
 537                                                 pc->curcmd_flags |= HEADER_PRINTED;
 538                                         }
 539 -                                       fprintf(fp, buf2);
 540 +                                       fputs(buf2, fp);
 541                                 }
 542                                 found = FALSE;
 543                                 fp = pc->tmpfile;
 544 @@ -1420,7 +1420,7 @@
 545                 sbp = ULONG(vfsmount_buf + OFFSET(vfsmount_mnt_sb));
 546
 547                 if (flags)
 548 -                       fprintf(fp, mount_hdr);
 549 +                       fputs(mount_hdr, fp);
 550                  fprintf(fp, "%s %s ",
 551                         mkstring(buf1, VADDR_PRLEN, RJUST|LONG_HEX,
 552                         MKSTR(*vfsmnt)),
 553 @@ -1449,7 +1449,7 @@
 554                 sprintf(buf1, "%s%s", buf3, buf4);
 555                 while ((strlen(buf1) > 17) && (buf1[strlen(buf1)-2] == ' '))
 556                         strip_ending_char(buf1, ' ');
 557 -               fprintf(fp, buf1);
 558 +               fputs(buf1, fp);
 559
 560                 if (VALID_MEMBER(vfsmount_mnt_dirname)) {
 561                         if (read_string(dirp, buf1, BUFSIZE-1))
 562 @@ -1486,7 +1486,7 @@
 563                                         fprintf(fp, "%s\n",
 564                                              mkstring(buf2, VADDR_PRLEN,
 565                                                  CENTER, "OPEN FILES"));
 566 -                                       fprintf(fp, mount_files_header);
 567 +                                       fputs(mount_files_header, fp);
 568                                         files_header_printed = 1;
 569                                 }
 570                                 file_dump(0, *dp, inode, 0, DUMP_DENTRY_ONLY);
 571 @@ -2221,14 +2221,14 @@
 572  #define PRINT_FILE_REFERENCE()                  \
 573         if (!root_pwd_printed) {                \
 574                 print_task_header(fp, tc, 0);   \
 575 -                fprintf(fp, root_pwd);          \
 576 +                fputs(root_pwd, fp);            \
 577                 root_pwd_printed = TRUE;        \
 578         }                                       \
 579         if (!header_printed) {                  \
 580 -               fprintf(fp, files_header);      \
 581 +               fputs(files_header, fp);        \
 582                  header_printed = TRUE;          \
 583         }                                       \
 584 -       fprintf(fp, buf4);                      \
 585 +       fputs(buf4, fp);                        \
 586         ref->cmdflags |= FILES_REF_FOUND;
 587
 588  #define FILENAME_COMPONENT(P,C) \
 589 @@ -2506,7 +2506,7 @@
 590                                 }
 591                                 else if (file) {
 592                                         if (!header_printed) {
 593 -                                               fprintf(fp, files_header);
 594 +                                               fputs(files_header, fp);
 595                                                 header_printed = 1;
 596                                         }
 597                                         file_dump(file, 0, 0, i,
 598 @@ -3237,8 +3237,8 @@
 599                         if (STRNEQ(buf, "PID:")) {
 600                                 if (!STREQ(uses, "")) {
 601                                         if (!fuser_header_printed) {
 602 -                                               fprintf(pc->saved_fp,
 603 -                                                       fuser_header);
 604 +                                               fputs(fuser_header,
 605 +                                                   pc->saved_fp);
 606                                                 fuser_header_printed = 1;
 607                                         }
 608                                         show_fuser(task_buf, uses);
 609 @@ -3294,7 +3294,7 @@
 610                 }
 611                 if (!STREQ(uses, "")) {
 612                         if (!fuser_header_printed) {
 613 -                               fprintf(pc->saved_fp, fuser_header);
 614 +                               fputs(fuser_header, pc->saved_fp);
 615                                 fuser_header_printed = 1;
 616                         }
 617                         show_fuser(task_buf, uses);
 618 --- crash-7.0.1/task.c.orig     2013-06-17 20:18:36.000000000 +0200
 619 +++ crash-7.0.1/task.c  2013-07-10 20:25:20.984656782 +0200
 620 @@ -2727,7 +2727,7 @@
 621                                 print_task_header(pc->saved_fp, tc, 0);
 622                                 header_printed = TRUE;
 623                         }
 624 -                       fprintf(pc->saved_fp, buf);
 625 +                       fputs(buf, pc->saved_fp);
 626                         if (STRNEQ(buf, lookfor2))
 627                                 BZERO(lookfor2, BUFSIZE);
 628                         continue;
 629 @@ -2738,7 +2738,7 @@
 630                                  print_task_header(pc->saved_fp, tc, 0);
 631                                  header_printed = TRUE;
 632                          }
 633 -                       fprintf(pc->saved_fp, buf);
 634 +                       fputs(buf, pc->saved_fp);
 635                         if (strstr(buf, lookfor3))
 636                                 BZERO(lookfor3, BUFSIZE);
 637                         continue;
 638 @@ -2754,7 +2754,7 @@
 639                                         print_task_header(pc->saved_fp, tc, 0);
 640                                         header_printed = TRUE;
 641                                 }
 642 -                               fprintf(pc->saved_fp, buf);
 643 +                               fputs(buf, pc->saved_fp);
 644                                 if (strstr(buf, "{{\n"))
 645                                         sprintf(lookfor2, "    }},");
 646                                 else if (strstr(buf, "{\n"))
 647 @@ -3447,14 +3447,14 @@
 648                 }
 649
 650                 if (bt->stkptr)
 651 -                       sprintf(buf, mkstring(buf1, VADDR_PRLEN,
 652 +                       strcpy(buf, mkstring(buf1, VADDR_PRLEN,
 653                                 CENTER|RJUST|LONG_HEX,
 654                                 MKSTR(bt->stkptr)));
 655                 else
 656                         sprintf(buf, "%s",
 657                             mkstring(buf1, VADDR_PRLEN, CENTER|RJUST, "--"));
 658         } else
 659 -               sprintf(buf, mkstring(buf1, VADDR_PRLEN,
 660 +               strcpy(buf, mkstring(buf1, VADDR_PRLEN,
 661                         CENTER|RJUST|LONG_HEX,
 662                         MKSTR(tc->task)));
 663
 664 @@ -8612,7 +8612,7 @@
 665                         }
 666
 667                         len += strlen(buf);
 668 -                       fprintf(fp, buf);
 669 +                       fputs(buf, fp);
 670                 }
 671
 672                 sigset >>= 1;
 673 --- crash-7.0.1/kernel.c.orig   2013-06-17 20:18:36.000000000 +0200
 674 +++ crash-7.0.1/kernel.c        2013-07-10 20:35:26.124686738 +0200
 675 @@ -1000,7 +1000,7 @@
 676         if (REMOTE())
 677                 sprintf(buf, "%s:%s", pc->server, pc->server_memsrc);
 678         else
 679 -               sprintf(buf, ACTIVE() ? pc->live_memsrc : pc->dumpfile);
 680 +               strcpy(buf, ACTIVE() ? pc->live_memsrc : pc->dumpfile);
 681
 682         error(INFO, "%s and %s do not match!\n",
 683                 pc->system_map ? pc->system_map :
 684 @@ -1262,7 +1262,7 @@
 685          if (REMOTE())
 686                  sprintf(buffer, "%s:%s", pc->server, pc->server_memsrc);
 687          else
 688 -                sprintf(buffer, ACTIVE() ? "live system" : pc->dumpfile);
 689 +                strcpy(buffer, ACTIVE() ? "live system" : pc->dumpfile);
 690
 691         sprintf(buffer2, " %s is %s -- %s is %s\n",
 692                  namelist, namelist_smp ? "SMP" : "not SMP",
 693 @@ -4381,13 +4381,13 @@
 694                 rem = (ulonglong)ts_nsec % (ulonglong)1000000000;
 695                 sprintf(buf, "[%5lld.%06ld] ", nanos, rem/1000);
 696                 ilen = strlen(buf);
 697 -               fprintf(fp, buf);
 698 +               fputs(buf, fp);
 699         }
 700
 701         if (msg_flags & SHOW_LOG_LEVEL) {
 702                 sprintf(buf, "<%x>", level);
 703                 ilen += strlen(buf);
 704 -               fprintf(fp, buf);
 705 +               fputs(buf, fp);
 706         }
 707
 708         for (i = 0, p = msg; i < text_len; i++, p++) {
 709 @@ -4901,7 +4901,7 @@
 710         if (spec)
 711                 open_tmpfile();
 712
 713 -       fprintf(fp, sys_call_hdr);
 714 +       fputs(sys_call_hdr, fp);
 715
 716          for (i = 0, sct = sys_call_table; i < NR_syscalls; i++, sct++) {
 717                  if (!(scp = value_symbol(*sct))) {
 718 --- crash-7.0.1/dev.c.orig      2013-06-17 20:18:36.000000000 +0200
 719 +++ crash-7.0.1/dev.c   2013-07-10 20:39:49.179635470 +0200
 720 @@ -224,7 +224,7 @@
 721                 switch (name_typecode)
 722                 {
 723                 case TYPE_CODE_ARRAY:
 724 -                       snprintf(buf, name_size, char_device_struct_buf +
 725 +                       snprintf(buf, name_size, "%s", char_device_struct_buf +
 726                             OFFSET(char_device_struct_name));
 727                         break;
 728                 case TYPE_CODE_PTR:
 729 @@ -294,7 +294,7 @@
 730                         switch (name_typecode)
 731                         {
 732                         case TYPE_CODE_ARRAY:
 733 -                               snprintf(buf, name_size, char_device_struct_buf +
 734 +                               snprintf(buf, name_size, "%s", char_device_struct_buf +
 735                                         OFFSET(char_device_struct_name));
 736                                 break;
 737                         case TYPE_CODE_PTR:
 738 --- crash-7.0.1/x86.c.orig      2013-06-17 20:18:36.000000000 +0200
 739 +++ crash-7.0.1/x86.c   2013-07-11 15:20:43.792426177 +0200
 740 @@ -3886,7 +3886,7 @@
 741
 742         value_to_symstr(addr, locbuf, 0);
 743         if (strlen(locbuf))
 744 -               sprintf(buf, locbuf);
 745 +               strcpy(buf, locbuf);
 746         else {
 747                 sprintf(buf, "%08lx", addr);
 748                 if (kvtop(NULL, addr, &phys, 0)) {
 749 @@ -4125,7 +4125,7 @@
 750                 sprintf(buf1, "0x%lx <%s>\n", value,
 751                         value_to_symstr(value, buf2, output_radix));
 752
 753 -               sprintf(p1, buf1);
 754 +               strcpy(p1, buf1);
 755         } else if (STREQ(argv[argc-2], "call") &&
 756             hexadecimal(argv[argc-1], 0)) {
 757                 /*
 758 @@ -4143,7 +4143,7 @@
 759                                  output_radix));
 760                          if (IS_MODULE_VADDR(value) &&
 761                              !strstr(buf2, "+"))
 762 -                                sprintf(p1, buf1);
 763 +                                strcpy(p1, buf1);
 764                 }
 765         }
 766         else if (STREQ(argv[2], "ud2a"))
 767 --- crash-7.0.1/arm.c.orig      2013-06-17 20:18:36.000000000 +0200
 768 +++ crash-7.0.1/arm.c   2013-07-11 15:22:18.316618562 +0200
 769 @@ -1437,7 +1437,7 @@
 770                 sprintf(buf1, "0x%lx <%s>\n", value,
 771                         value_to_symstr(value, buf2, output_radix));
 772
 773 -               sprintf(p1, buf1);
 774 +               strcpy(p1, buf1);
 775         }
 776
 777         console("    %s", inbuf);
 778 --- crash-7.0.1/arm64.c.orig    2013-06-17 20:18:36.000000000 +0200
 779 +++ crash-7.0.1/arm64.c 2013-07-11 15:23:25.076246883 +0200
 780 @@ -1117,7 +1117,7 @@
 781                 sprintf(buf1, "0x%lx <%s>\n", value,
 782                         value_to_symstr(value, buf2, output_radix));
 783
 784 -               sprintf(p1, buf1);
 785 +               strcpy(p1, buf1);
 786         }
 787
 788         console("    %s", inbuf);
 789 --- crash-7.0.1/ia64.c.orig     2013-06-17 20:18:36.000000000 +0200
 790 +++ crash-7.0.1/ia64.c  2013-07-11 15:26:24.990897403 +0200
 791 @@ -1504,7 +1504,7 @@
 792                                         output_radix));
 793                                 if (IS_MODULE_VADDR(value) &&
 794                                     !strstr(buf2, "+"))
 795 -                                       sprintf(p2, buf1);
 796 +                                       strcpy(p2, buf1);
 797                         }
 798                 } else {
 799                         p1 = &argv[argc-1][3];
 800 @@ -1515,7 +1515,7 @@
 801                                         output_radix));
 802                                 if (IS_MODULE_VADDR(value) &&
 803                                     !strstr(buf2, "+"))
 804 -                                       sprintf(p2, buf1);
 805 +                                       strcpy(p2, buf1);
 806                         }
 807                 }
 808         }
 809 --- crash-7.0.1/ppc.c.orig      2013-06-17 20:18:36.000000000 +0200
 810 +++ crash-7.0.1/ppc.c   2013-07-11 15:28:01.745192065 +0200
 811 @@ -1748,7 +1748,7 @@
 812                 sprintf(buf1, "0x%lx <%s>\n", value,
 813                         value_to_symstr(value, buf2, output_radix));
 814
 815 -               sprintf(p1, buf1);
 816 +               strcpy(p1, buf1);
 817         }
 818
 819         console("    %s", inbuf);
 820 --- crash-7.0.1/ppc64.c.orig    2013-06-17 20:18:36.000000000 +0200
 821 +++ crash-7.0.1/ppc64.c 2013-07-11 15:29:49.736652894 +0200
 822 @@ -2387,7 +2387,7 @@
 823                 sprintf(buf1, "0x%lx <%s>\n", value,
 824                         value_to_symstr(value, buf2, output_radix));
 825
 826 -               sprintf(p1, buf1);
 827 +               strcpy(p1, buf1);
 828         }
 829
 830         console("    %s", inbuf);
 831 --- crash-7.0.1/s390.c.orig     2013-06-17 20:18:36.000000000 +0200
 832 +++ crash-7.0.1/s390.c  2013-07-11 15:30:55.692914594 +0200
 833 @@ -1012,7 +1012,7 @@
 834                 sprintf(buf1, "0x%lx <%s>\n", value,
 835                         value_to_symstr(value, buf2, output_radix));
 836
 837 -               sprintf(p1, buf1);
 838 +               strcpy(p1, buf1);
 839         }
 840
 841         console("    %s", inbuf);
 842 --- crash-7.0.1/s390x.c.orig    2013-06-17 20:18:36.000000000 +0200
 843 +++ crash-7.0.1/s390x.c 2013-07-11 15:31:58.392365216 +0200
 844 @@ -1466,7 +1466,7 @@
 845                 sprintf(buf1, "0x%lx <%s>\n", value,
 846                         value_to_symstr(value, buf2, output_radix));
 847
 848 -               sprintf(p1, buf1);
 849 +               strcpy(p1, buf1);
 850         }
 851
 852         console("    %s", inbuf);