upstream/mercurial-mirror Files · rust/chg/src/sendfds.c

rust-revlog: fix incorrect results with NULL_NODE prefixes...

rust-revlog: fix incorrect results with NULL_NODE prefixes In case a short hash is a prefix of `NULL_NODE`, the correct revision number lookup is `NULL_REVISION` only if there is no match in the nodemap. Indeed, if there is a single nodemap match, then it is an ambiguity with the always matching `NULL_NODE`. Before this change, using the Mercurial development repository as a testbed (it has public changesets with node ID starting with `0005` and `0009`), this is what `rhg` did (plain `hg` provided for reference) ``` $ rust/target/debug/rhg cat -r 000 README README: no such file in rev $ hg cat -r 000 README abort: ambiguous revision identifier: 000 ``` Here is the expected output for `rhg` on ambiguous prefixes (again, before this change): ``` $ rust/target/debug/rhg cat -r 0001 README abort: ambiguous revision identifier: 0001 ``` The test provided by in `test-rhg.t` could become flaky with this change, unless all hashes are fixed. We expect reviewers to be more sure about that than we are.

Yuya Nishihara - - Load All Authors

File last commit:

r40005:208cb7a9 default


                r51637:bca40373

stable

Download file

             sendfds.c
        
                    51 lines
            
             | 1.3 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / rust / chg / src / sendfds.c
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       * Utility to send fds via Unix domain socket

       *

       * Copyright 2011, 2018 Yuya Nishihara <yuya@tcha.org>

       *

       * This software may be used and distributed according to the terms of the

       * GNU General Public License version 2 or any later version.

       */

      #include <errno.h>

      #include <stdlib.h>

      #include <string.h>

      #include <sys/socket.h>

      #include <sys/types.h>

      #define MAX_FD_LEN 10

      /*

       * Sends the given fds with 1-byte dummy payload.

       *

       * Returns the number of bytes sent on success, -1 on error and errno is set

       * appropriately.

       */

      ssize_t sendfds(int sockfd, const int *fds, size_t fdlen)

      {

      	char dummy[1] = {0};

      	struct iovec iov = {dummy, sizeof(dummy)};

      	char fdbuf[CMSG_SPACE(sizeof(fds[0]) * MAX_FD_LEN)];

      	struct msghdr msgh;

      	struct cmsghdr *cmsg;

      	/* just use a fixed-size buffer since we'll never send tons of fds */

      	if (fdlen > MAX_FD_LEN) {

      		errno = EINVAL;

      		return -1;

      	}

      	memset(&msgh, 0, sizeof(msgh));

      	msgh.msg_iov = &iov;

      	msgh.msg_iovlen = 1;

      	msgh.msg_control = fdbuf;

      	msgh.msg_controllen = CMSG_SPACE(sizeof(fds[0]) * fdlen);

      	cmsg = CMSG_FIRSTHDR(&msgh);

      	cmsg->cmsg_level = SOL_SOCKET;

      	cmsg->cmsg_type = SCM_RIGHTS;

      	cmsg->cmsg_len = CMSG_LEN(sizeof(fds[0]) * fdlen);

      	memcpy(CMSG_DATA(cmsg), fds, sizeof(fds[0]) * fdlen);

      	msgh.msg_controllen = cmsg->cmsg_len;

      	return sendmsg(sockfd, &msgh, 0);

      }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				/*
				* Utility to send fds via Unix domain socket
				*
				* Copyright 2011, 2018 Yuya Nishihara <yuya@tcha.org>
				*
				* This software may be used and distributed according to the terms of the
				* GNU General Public License version 2 or any later version.
				*/

				#include <errno.h>
				#include <stdlib.h>
				#include <string.h>
				#include <sys/socket.h>
				#include <sys/types.h>

				#define MAX_FD_LEN 10

				/*
				* Sends the given fds with 1-byte dummy payload.
				*
				* Returns the number of bytes sent on success, -1 on error and errno is set
				* appropriately.
				*/
				ssize_t sendfds(int sockfd, const int *fds, size_t fdlen)
				{
				char dummy[1] = {0};
				struct iovec iov = {dummy, sizeof(dummy)};
				char fdbuf[CMSG_SPACE(sizeof(fds[0]) * MAX_FD_LEN)];
				struct msghdr msgh;
				struct cmsghdr *cmsg;

				/* just use a fixed-size buffer since we'll never send tons of fds */
				if (fdlen > MAX_FD_LEN) {
				errno = EINVAL;
				return -1;
				}

				memset(&msgh, 0, sizeof(msgh));
				msgh.msg_iov = &iov;
				msgh.msg_iovlen = 1;
				msgh.msg_control = fdbuf;
				msgh.msg_controllen = CMSG_SPACE(sizeof(fds[0]) * fdlen);

				cmsg = CMSG_FIRSTHDR(&msgh);
				cmsg->cmsg_level = SOL_SOCKET;
				cmsg->cmsg_type = SCM_RIGHTS;
				cmsg->cmsg_len = CMSG_LEN(sizeof(fds[0]) * fdlen);
				memcpy(CMSG_DATA(cmsg), fds, sizeof(fds[0]) * fdlen);
				msgh.msg_controllen = cmsg->cmsg_len;
				return sendmsg(sockfd, &msgh, 0);
				}