API tools faq
paste
Advertisement
z3ntu

hurd diff

z3ntu
Jun 12th, 2018
190
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.53 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/isofs/rr.c b/isofs/rr.c
  2. index 85aa5695..e9a672f7 100644
  3. --- a/isofs/rr.c
  4. +++ b/isofs/rr.c
  5. @@ -347,7 +347,7 @@ rrip_work (struct dirrect *dr, struct rrip_lookup *rr,
  6.       struct rr_pn *pn = body;
  7.  
  8.       rr->valid |= VALID_PN;
  9. -     rr->rdev = makedev (isonum_733 (pn->high), isonum_733 (pn->low));
  10. +     rr->rdev = gnu_dev_makedev (isonum_733 (pn->high), isonum_733 (pn->low));
  11.  
  12.       goto next_field;
  13.     }
  14. diff --git a/libdiskfs/file-set-trans.c b/libdiskfs/file-set-trans.c
  15. index de52ba49..405a7861 100644
  16. --- a/libdiskfs/file-set-trans.c
  17. +++ b/libdiskfs/file-set-trans.c
  18. @@ -159,13 +159,13 @@ diskfs_S_file_set_translator (struct protid *cred,
  19.           minor = strtol (arg, 0, 0);
  20.  
  21.           err = diskfs_validate_rdev_change (np,
  22. -                              makedev (major, minor));
  23. +                              gnu_dev_makedev (major, minor));
  24.           if (err)
  25.             {
  26.               pthread_mutex_unlock (&np->lock);
  27.               return err;
  28.             }
  29. -         np->dn_stat.st_rdev = makedev (major, minor);
  30. +         np->dn_stat.st_rdev = gnu_dev_makedev (major, minor);
  31.         }
  32.  
  33.           err = diskfs_truncate (np, 0);
  34. diff --git a/libfshelp/fetch-root.c b/libfshelp/fetch-root.c
  35. index 0248f11d..082308da 100644
  36. --- a/libfshelp/fetch-root.c
  37. +++ b/libfshelp/fetch-root.c
  38. @@ -216,8 +216,8 @@ fshelp_short_circuited_callback1 (void *cookie1, void *cookie2,
  39.        if (asprintf (argz, "%s%c%d%c%d",
  40.             (S_ISCHR (*statc->modep)
  41.              ? _HURD_CHRDEV : _HURD_BLKDEV),
  42. -           0, major (statc->statp->st_rdev),
  43. -           0, minor (statc->statp->st_rdev)) < 0)
  44. +           0, gnu_dev_major (statc->statp->st_rdev),
  45. +           0, gnu_dev_minor (statc->statp->st_rdev)) < 0)
  46.     return ENOMEM;
  47.        *argz_len = strlen (*argz) + 1;
  48.        *argz_len += strlen (*argz + *argz_len) + 1;
  49. diff --git a/libnetfs/file-get-translator.c b/libnetfs/file-get-translator.c
  50. index 3a54ff10..9a5c425d 100644
  51. --- a/libnetfs/file-get-translator.c
  52. +++ b/libnetfs/file-get-translator.c
  53. @@ -71,8 +71,8 @@ netfs_S_file_get_translator (struct protid *user,
  54.              (S_ISCHR (np->nn_stat.st_mode)
  55.               ? _HURD_CHRDEV
  56.               : _HURD_BLKDEV),
  57. -            '\0', major (np->nn_stat.st_rdev),
  58. -            '\0', minor (np->nn_stat.st_rdev));
  59. +            '\0', gnu_dev_major (np->nn_stat.st_rdev),
  60. +            '\0', gnu_dev_minor (np->nn_stat.st_rdev));
  61.        if (buflen < 0)
  62.     err = ENOMEM;
  63.        else
  64. diff --git a/libnetfs/file-set-translator.c b/libnetfs/file-set-translator.c
  65. index 2b71848c..4fc591e8 100644
  66. --- a/libnetfs/file-set-translator.c
  67. +++ b/libnetfs/file-set-translator.c
  68. @@ -140,7 +140,7 @@ netfs_S_file_set_translator (struct protid *user,
  69.       minor = strtol (arg, 0, 0);
  70.  
  71.       err = netfs_attempt_mkdev (user->user, np,
  72. -                    newmode, makedev (major, minor));
  73. +                    newmode, gnu_dev_makedev (major, minor));
  74.       if (err == EOPNOTSUPP)
  75.         goto fallback;
  76.       break;
  77. diff --git a/nfs/nfs.c b/nfs/nfs.c
  78. index c4d3e157..1a8b1d42 100644
  79. --- a/nfs/nfs.c
  80. +++ b/nfs/nfs.c
  81. @@ -466,7 +466,7 @@ xdr_decode_fattr (int *p, struct stat *st)
  82.        p++;
  83.        minor = ntohl (*p);
  84.        p++;
  85. -      st->st_rdev = makedev (major, minor);
  86. +      st->st_rdev = gnu_dev_makedev (major, minor);
  87.      }
  88.    st->st_fsid = ntohl (*p);
  89.    p++;
  90. diff --git a/nfs/ops.c b/nfs/ops.c
  91. index 03690b75..b5a80005 100644
  92. --- a/nfs/ops.c
  93. +++ b/nfs/ops.c
  94. @@ -1037,8 +1037,8 @@ netfs_attempt_link (struct iouser *cred, struct node *dir,
  95.       p = xdr_encode_sattr_stat (p, &np->nn_stat);
  96.       if (np->nn->dtrans == BLKDEV || np->nn->dtrans == CHRDEV)
  97.         {
  98. -         *(p++) = htonl (major (np->nn_stat.st_rdev));
  99. -         *(p++) = htonl (minor (np->nn_stat.st_rdev));
  100. +         *(p++) = htonl (gnu_dev_major (np->nn_stat.st_rdev));
  101. +         *(p++) = htonl (gnu_dev_minor (np->nn_stat.st_rdev));
  102.         }
  103.       pthread_mutex_unlock (&np->lock);
  104.  
  105. diff --git a/pfinet/glue-include/linux/mm.h b/pfinet/glue-include/linux/mm.h
  106. index 546776e8..d0fa9eab 100644
  107. --- a/pfinet/glue-include/linux/mm.h
  108. +++ b/pfinet/glue-include/linux/mm.h
  109. @@ -18,6 +18,7 @@
  110.  #include <mach.h>
  111.  #include <sys/mman.h>
  112.  #include <stdint.h>
  113. +#include <mach/vm_param.h>
  114.  
  115.  #define PAGE_SIZE  (1 << PAGE_SHIFT)
  116.  
  117. diff --git a/storeio/storeio.c b/storeio/storeio.c
  118. index 515944ed..96ea6823 100644
  119. --- a/storeio/storeio.c
  120. +++ b/storeio/storeio.c
  121. @@ -83,7 +83,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
  122.       /* MAJOR,MINOR form */
  123.       {
  124.         start = end + 1;
  125. -       rdev = makedev (rdev, strtoul (start, &end, 0));
  126. +       rdev = gnu_dev_makedev (rdev, strtoul (start, &end, 0));
  127.       }
  128.  
  129.     if (end == start || *end != '\0')
  130. @@ -164,7 +164,7 @@ trivfs_append_args (struct trivfs_control *trivfs_control,
  131.      {
  132.        char buf[40];
  133.        snprintf (buf, sizeof buf, "--rdev=%d,%d",
  134. -       major (dev->rdev), minor (dev->rdev));
  135. +       gnu_dev_major (dev->rdev), gnu_dev_minor (dev->rdev));
  136.        err = argz_add (argz, argz_len, buf);
  137.      }
  138.  
  139. diff --git a/term/users.c b/term/users.c
  140. index 4e8368e7..ff9888e1 100644
  141. --- a/term/users.c
  142. +++ b/term/users.c
  143. @@ -32,6 +32,7 @@
  144.  #include <hurd/fshelp.h>
  145.  #include <error.h>
  146.  #include "ourmsg_U.h"
  147. +#include <signal.h>
  148.  
  149.  
  150.  #undef ECHO
  151. diff --git a/trans/fakeroot.c b/trans/fakeroot.c
  152. index 6ef93327..7313a98e 100644
  153. --- a/trans/fakeroot.c
  154. +++ b/trans/fakeroot.c
  155. @@ -659,7 +659,7 @@ netfs_attempt_mkdev (struct iouser *cred, struct node *np,
  156.    char *trans = 0;
  157.    int translen = asprintf (&trans, "%s%c%d%c%d",
  158.                S_ISCHR (type) ? _HURD_CHRDEV : _HURD_BLKDEV,
  159. -              '\0', major (indexes), '\0', minor (indexes));
  160. +              '\0', gnu_dev_major (indexes), '\0', gnu_dev_minor (indexes));
  161.    if (trans == 0)
  162.      return ENOMEM;
  163.    else
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!