mrouted-3.9-beta3-bcopy_bcmp_bzero.patch 5.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164
  1. diff -urN mrouted-3.9-beta3.0rig/cfparse.y mrouted-3.9-beta3/cfparse.y
  2. --- mrouted-3.9-beta3.0rig/cfparse.y 1998-03-01 02:48:58.000000000 +0100
  3. +++ mrouted-3.9-beta3/cfparse.y 2009-01-14 21:17:00.000000000 +0100
  4. @@ -583,8 +583,7 @@
  5. if (hp->h_addr_list[1])
  6. fatal("Hostname %s does not %s",
  7. $1, "map to a unique address");
  8. -
  9. - bcopy(hp->h_addr_list[0], &$$,
  10. + memmove (&$$, hp->h_addr_list[0],
  11. hp->h_length);
  12. }
  13. diff -urN mrouted-3.9-beta3.0rig/config.c mrouted-3.9-beta3/config.c
  14. --- mrouted-3.9-beta3.0rig/config.c 1998-01-06 02:57:41.000000000 +0100
  15. +++ mrouted-3.9-beta3/config.c 2009-01-14 21:18:59.000000000 +0100
  16. @@ -89,7 +89,7 @@
  17. * SIOCGIFFLAGS stomps over it because the requests
  18. * are returned in a union.)
  19. */
  20. - bcopy(ifrp->ifr_name, ifr.ifr_name, sizeof(ifr.ifr_name));
  21. + memmove (ifr.ifr_name, ifrp->ifr_name, sizeof(ifr.ifr_name));
  22. /*
  23. * Ignore loopback interfaces and interfaces that do not support
  24. diff -urN mrouted-3.9-beta3.0rig/defs.h mrouted-3.9-beta3/defs.h
  25. --- mrouted-3.9-beta3.0rig/defs.h 2009-01-14 21:12:22.000000000 +0100
  26. +++ mrouted-3.9-beta3/defs.h 2009-01-14 21:20:05.000000000 +0100
  27. @@ -116,8 +116,6 @@
  28. #endif /* RSRR */
  29. #ifdef SYSV
  30. -#define bcopy(a, b, c) memcpy(b, a, c)
  31. -#define bzero(s, n) memset((s), 0, (n))
  32. #define setlinebuf(s) setvbuf(s, NULL, _IOLBF, 0)
  33. #endif
  34. diff -urN mrouted-3.9-beta3.0rig/igmp.c mrouted-3.9-beta3/igmp.c
  35. --- mrouted-3.9-beta3.0rig/igmp.c 1998-01-06 02:57:43.000000000 +0100
  36. +++ mrouted-3.9-beta3/igmp.c 2009-01-14 21:27:41.000000000 +0100
  37. @@ -56,7 +56,7 @@
  38. k_set_loop(FALSE); /* disable multicast loopback */
  39. ip = (struct ip *)send_buf;
  40. - bzero(ip, sizeof(struct ip));
  41. + memset(ip, 0, sizeof(struct ip));
  42. /*
  43. * Fields zeroed that aren't filled in later:
  44. * - IP ID (let the kernel fill it in)
  45. @@ -421,7 +421,7 @@
  46. }
  47. }
  48. - bzero(&sdst, sizeof(sdst));
  49. + memset(&sdst, 0, sizeof(sdst));
  50. sdst.sin_family = AF_INET;
  51. #ifdef HAVE_SA_LEN
  52. sdst.sin_len = sizeof(sdst);
  53. diff -urN mrouted-3.9-beta3.0rig/ipip.c mrouted-3.9-beta3/ipip.c
  54. --- mrouted-3.9-beta3.0rig/ipip.c 1998-01-06 02:57:45.000000000 +0100
  55. +++ mrouted-3.9-beta3/ipip.c 2009-01-14 21:28:19.000000000 +0100
  56. @@ -61,7 +61,7 @@
  57. ip = v->uv_encap_hdr = (struct ip *)malloc(sizeof(struct ip));
  58. if (ip == NULL)
  59. log(LOG_ERR, 0, "out of memory");
  60. - bzero(ip, sizeof(struct ip));
  61. + memset(ip, 0, sizeof(struct ip));
  62. /*
  63. * Fields zeroed that aren't filled in later:
  64. * - IP ID (let the kernel fill it in)
  65. @@ -111,7 +111,7 @@
  66. ip->ip_len = htons(ip->ip_len);
  67. #endif
  68. - bzero(&sdst, sizeof(sdst));
  69. + memset(&sdst, 0, sizeof(sdst));
  70. sdst.sin_family = AF_INET;
  71. #ifdef HAVE_SA_LEN
  72. sdst.sin_len = sizeof(sdst);
  73. @@ -123,7 +123,7 @@
  74. iov[1].iov_base = (caddr_t)send_buf;
  75. iov[1].iov_len = MIN_IP_HEADER_LEN + IGMP_MINLEN + datalen;
  76. - bzero(&msg, sizeof(msg));
  77. + memset(&msg, 0, sizeof(msg));
  78. msg.msg_name = (caddr_t)&sdst;
  79. msg.msg_namelen = sizeof(sdst);
  80. msg.msg_iov = iov;
  81. diff -urN mrouted-3.9-beta3.0rig/main.c mrouted-3.9-beta3/main.c
  82. --- mrouted-3.9-beta3.0rig/main.c 2009-01-14 21:12:22.000000000 +0100
  83. +++ mrouted-3.9-beta3/main.c 2009-01-14 21:22:33.000000000 +0100
  84. @@ -429,7 +429,7 @@
  85. gettimeofday(&curtime, NULL);
  86. lasttime = curtime;
  87. for(;;) {
  88. - bcopy((char *)&readers, (char *)&rfds, sizeof(rfds));
  89. + memmove ((char *)&rfds, (char *)&readers, sizeof(rfds));
  90. secs = timer_nextTimer();
  91. if (secs == -1)
  92. timeout = NULL;
  93. diff -urN mrouted-3.9-beta3.0rig/prune.c mrouted-3.9-beta3/prune.c
  94. --- mrouted-3.9-beta3.0rig/prune.c 1998-03-01 03:06:32.000000000 +0100
  95. +++ mrouted-3.9-beta3/prune.c 2009-01-14 21:27:06.000000000 +0100
  96. @@ -2450,7 +2450,7 @@
  97. /* copy the packet to the sending buffer */
  98. p = send_buf + MIN_IP_HEADER_LEN + IGMP_MINLEN;
  99. - bcopy(data, p, datalen);
  100. + memmove (p, data, datalen);
  101. p += datalen;
  102. @@ -2469,7 +2469,7 @@
  103. * fill in initial response fields
  104. */
  105. resp = (struct tr_resp *)p;
  106. - bzero(resp, sizeof(struct tr_resp));
  107. + memset(resp, 0, sizeof(struct tr_resp));
  108. datalen += RLEN;
  109. resp->tr_qarr = htonl(((tp.tv_sec + JAN_1970) << 16) +
  110. diff -urN mrouted-3.9-beta3.0rig/route.c mrouted-3.9-beta3/route.c
  111. --- mrouted-3.9-beta3.0rig/route.c 1998-01-15 01:08:34.000000000 +0100
  112. +++ mrouted-3.9-beta3/route.c 2009-01-14 21:26:37.000000000 +0100
  113. @@ -388,7 +388,8 @@
  114. else r->rt_originwidth = 1;
  115. r->rt_flags = 0;
  116. r->rt_dominants = (u_int32 *)(r + 1);
  117. - bzero(r->rt_dominants, numvifs * sizeof(u_int32));
  118. + memset(r->rt_dominants, 0, numvifs * sizeof(u_int32));
  119. +
  120. r->rt_groups = NULL;
  121. VIFM_CLRALL(r->rt_children);
  122. NBRM_CLRALL(r->rt_subordinates);
  123. @@ -968,7 +969,7 @@
  124. bh->bh_dst = dst;
  125. bh->bh_level = level;
  126. bh->bh_datalen = datalen;
  127. - bcopy(p, (char *)(bh + 1), datalen);
  128. + memmove ((char *)(bh + 1), p, datalen);
  129. v->uv_blasterend += bblen;
  130. if (v->uv_blastertimer == 0) {
  131. diff -urN mrouted-3.9-beta3.0rig/rsrr.c mrouted-3.9-beta3/rsrr.c
  132. --- mrouted-3.9-beta3.0rig/rsrr.c 1998-01-06 02:57:58.000000000 +0100
  133. +++ mrouted-3.9-beta3/rsrr.c 2009-01-14 21:29:18.000000000 +0100
  134. @@ -81,7 +81,7 @@
  135. log(LOG_ERR, errno, "Can't create RSRR socket");
  136. unlink(RSRR_SERV_PATH);
  137. - bzero((char *) &serv_addr, sizeof(serv_addr));
  138. + memset((char *) &serv_addr, 0, sizeof(serv_addr));
  139. serv_addr.sun_family = AF_UNIX;
  140. strcpy(serv_addr.sun_path, RSRR_SERV_PATH);
  141. #ifdef HAVE_SA_LEN
  142. @@ -107,7 +107,7 @@
  143. {
  144. register int rsrr_recvlen;
  145. - bzero((char *) &client_addr, sizeof(client_addr));
  146. + memset((char *) &client_addr, 0, sizeof(client_addr));
  147. rsrr_recvlen = recvfrom(rsrr_socket, rsrr_recv_buf, sizeof(rsrr_recv_buf),
  148. 0, (struct sockaddr *)&client_addr, &client_length);
  149. if (rsrr_recvlen < 0) {