Break some lines before not after operators.

The GNU Coding Standards specify that line breaks in expressions
should go before an operator, not after one.  This patch fixes various
code to do this.  It only changes code that appears to be mostly
following GNU style anyway, not files and directories with
substantially different formatting.  It is not exhaustive even for
files using GNU style (for example, changes to sysdeps files are
deferred for subsequent cleanups).  Some files changed are shared with
gnulib, but most are specific to glibc.  Changes were made manually,
with places to change found by grep (so some cases, e.g. where the
operator was followed by a comment at end of line, are particularly
liable to have been missed by grep, but I did include cases where the
operator was followed by backslash-newline).

This patch generally does not attempt to address other coding style
issues in the expressions changed (for example, missing spaces before
'(', or lack of parentheses to ensure indentation of continuation
lines properly reflects operator precedence).

Tested for x86_64, and with build-many-glibcs.py.

	* benchtests/bench-memmem.c (simple_memmem): Break lines before
	rather than after operators.
	* benchtests/bench-skeleton.c (TIMESPEC_AFTER): Likewise.
	* crypt/md5.c (md5_finish_ctx): Likewise.
	* crypt/sha256.c (__sha256_finish_ctx): Likewise.
	* crypt/sha512.c (__sha512_finish_ctx): Likewise.
	* elf/cache.c (load_aux_cache): Likewise.
	* elf/dl-load.c (open_verify): Likewise.
	* elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise.
	* elf/readelflib.c (process_elf_file): Likewise.
	* elf/rtld.c (dl_main): Likewise.
	* elf/sprof.c (generate_call_graph): Likewise.
	* hurd/ctty-input.c (_hurd_ctty_input): Likewise.
	* hurd/ctty-output.c (_hurd_ctty_output): Likewise.
	* hurd/dtable.c (reauth_dtable): Likewise.
	* hurd/getdport.c (__getdport): Likewise.
	* hurd/hurd/signal.h (_hurd_interrupted_rpc_timeout): Likewise.
	* hurd/hurd/sigpreempt.h (HURD_PREEMPT_SIGNAL_P): Likewise.
	* hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise):
	Likewise.
	* hurd/hurdioctl.c (fioctl): Likewise.
	* hurd/hurdselect.c (_hurd_select): Likewise.
	* hurd/hurdsig.c (_hurdsig_abort_rpcs): Likewise.
	(STOPSIGS): Likewise.
	* hurd/hurdstartup.c (_hurd_startup): Likewise.
	* hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Likewise.
	* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise.
	* hurd/msgportdemux.c (msgport_server): Likewise.
	* hurd/setauth.c (_hurd_setauth): Likewise.
	* include/features.h (__GLIBC_USE_DEPRECATED_SCANF): Likewise.
	* libio/libioP.h [IO_DEBUG] (CHECK_FILE): Likewise.
	* locale/programs/ld-ctype.c (set_class_defaults): Likewise.
	* localedata/tests-mbwc/tst_swscanf.c (tst_swscanf): Likewise.
	* login/tst-utmp.c (do_check): Likewise.
	(simulate_login): Likewise.
	* mach/lowlevellock.h (lll_lock): Likewise.
	(lll_trylock): Likewise.
	* math/test-fenv.c (ALL_EXC): Likewise.
	* math/test-fenvinline.c (ALL_EXC): Likewise.
	* misc/sys/cdefs.h (__attribute_deprecated_msg__): Likewise.
	* nis/nis_call.c (__do_niscall3): Likewise.
	* nis/nis_callback.c (cb_prog_1): Likewise.
	* nis/nis_defaults.c (searchaccess): Likewise.
	* nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise.
	* nis/nis_ismember.c (internal_ismember): Likewise.
	* nis/nis_local_names.c (nis_local_principal): Likewise.
	* nis/nss_nis/nis-rpc.c (_nss_nis_getrpcbyname_r): Likewise.
	* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r):
	Likewise.
	* nis/ypclnt.c (yp_match): Likewise.
	(yp_first): Likewise.
	(yp_next): Likewise.
	(yp_master): Likewise.
	(yp_order): Likewise.
	* nscd/hstcache.c (cache_addhst): Likewise.
	* nscd/initgrcache.c (addinitgroupsX): Likewise.
	* nss/nss_compat/compat-pwd.c (copy_pwd_changes): Likewise.
	(internal_getpwuid_r): Likewise.
	* nss/nss_compat/compat-spwd.c (copy_spwd_changes): Likewise.
	* posix/glob.h (__GLOB_FLAGS): Likewise.
	* posix/regcomp.c (peek_token): Likewise.
	(peek_token_bracket): Likewise.
	(parse_expression): Likewise.
	* posix/regexec.c (sift_states_iter_mb): Likewise.
	(check_node_accept_bytes): Likewise.
	* posix/tst-spawn3.c (do_test): Likewise.
	* posix/wordexp-test.c (testit): Likewise.
	* posix/wordexp.c (parse_tilde): Likewise.
	(exec_comm): Likewise.
	* posix/wordexp.h (__WRDE_FLAGS): Likewise.
	* resource/vtimes.c (TIMEVAL_TO_VTIMES): Likewise.
	* setjmp/sigjmp.c (__sigjmp_save): Likewise.
	* stdio-common/printf_fp.c (__printf_fp_l): Likewise.
	* stdio-common/tst-fileno.c (do_test): Likewise.
	* stdio-common/vfprintf-internal.c (vfprintf): Likewise.
	* stdlib/strfmon_l.c (__vstrfmon_l_internal): Likewise.
	* stdlib/strtod_l.c (round_and_return): Likewise.
	(____STRTOF_INTERNAL): Likewise.
	* stdlib/tst-strfrom.h (TEST_STRFROM): Likewise.
	* string/strcspn.c (STRCSPN): Likewise.
	* string/test-memmem.c (simple_memmem): Likewise.
	* termios/tcsetattr.c (tcsetattr): Likewise.
	* time/alt_digit.c (_nl_parse_alt_digit): Likewise.
	* time/asctime.c (asctime_internal): Likewise.
	* time/strptime_l.c (__strptime_internal): Likewise.
	* time/sys/time.h (timercmp): Likewise.
	* time/tzfile.c (__tzfile_compute): Likewise.

15 files changed, 79 insertions, 79 deletions

diff --git a/hurd/ctty-input.c b/hurd/ctty-input.c
index df03f8d69f..beff4f6d11 100644
--- a/hurd/ctty-input.c
+++ b/hurd/ctty-input.c
@@ -44,8 +44,8 @@ _hurd_ctty_input (io_t port, io_t ctty, error_t (*rpc) (io_t))
 	    {
 	      struct hurd_sigstate *ss = _hurd_self_sigstate ();
 	      __spin_lock (&ss->lock);
-	      if (__sigismember (&ss->blocked, SIGTTIN) ||
-		  ss->actions[SIGTTIN].sa_handler == SIG_IGN)
+	      if (__sigismember (&ss->blocked, SIGTTIN)
+		  || ss->actions[SIGTTIN].sa_handler == SIG_IGN)
 		/* We are blocking or ignoring SIGTTIN.  Just fail.  */
 		err = EIO;
 	      __spin_unlock (&ss->lock);
diff --git a/hurd/ctty-output.c b/hurd/ctty-output.c
index 46fe399970..77b931ccef 100644
--- a/hurd/ctty-output.c
+++ b/hurd/ctty-output.c
@@ -38,8 +38,8 @@ _hurd_ctty_output (io_t port, io_t ctty, error_t (*rpc) (io_t))
 	     SIGTTOU.  We redo this check at the top of the loop in case
 	     the signal handler changed the state.  */
 	  __spin_lock (&ss->lock);
-	  if (__sigismember (&ss->blocked, SIGTTOU) ||
-	      ss->actions[SIGTTOU].sa_handler == SIG_IGN)
+	  if (__sigismember (&ss->blocked, SIGTTOU)
+	      || ss->actions[SIGTTOU].sa_handler == SIG_IGN)
 	    err = EIO;
 	  else
 	    err = 0;
diff --git a/hurd/dtable.c b/hurd/dtable.c
index c0bb4a43d3..2663d25000 100644
--- a/hurd/dtable.c
+++ b/hurd/dtable.c
@@ -266,24 +266,24 @@ reauth_dtable (void)
       __spin_lock (&d->port.lock);
 
       /* Reauthenticate the descriptor's port.  */
-      if (d->port.port != MACH_PORT_NULL &&
-	  ! __io_reauthenticate (d->port.port,
-				 ref, MACH_MSG_TYPE_MAKE_SEND) &&
-	  ! __USEPORT (AUTH, __auth_user_authenticate
-		       (port,
-			ref, MACH_MSG_TYPE_MAKE_SEND,
-			&new)))
+      if (d->port.port != MACH_PORT_NULL
+	  && ! __io_reauthenticate (d->port.port,
+				    ref, MACH_MSG_TYPE_MAKE_SEND)
+	  && ! __USEPORT (AUTH, __auth_user_authenticate
+			  (port,
+			   ref, MACH_MSG_TYPE_MAKE_SEND,
+			   &new)))
 	{
 	  /* Replace the port in the descriptor cell
 	     with the newly reauthenticated port.  */
 
-	  if (d->ctty.port != MACH_PORT_NULL &&
-	      ! __io_reauthenticate (d->ctty.port,
-				     ref, MACH_MSG_TYPE_MAKE_SEND) &&
-	      ! __USEPORT (AUTH, __auth_user_authenticate
-			   (port,
-			    ref, MACH_MSG_TYPE_MAKE_SEND,
-			    &newctty)))
+	  if (d->ctty.port != MACH_PORT_NULL
+	      && ! __io_reauthenticate (d->ctty.port,
+					ref, MACH_MSG_TYPE_MAKE_SEND)
+	      && ! __USEPORT (AUTH, __auth_user_authenticate
+			      (port,
+			       ref, MACH_MSG_TYPE_MAKE_SEND,
+			       &newctty)))
 	    _hurd_port_set (&d->ctty, newctty);
 
 	  _hurd_port_locked_set (&d->port, new);
diff --git a/hurd/getdport.c b/hurd/getdport.c
index 09ccc64dcf..8c63789276 100644
--- a/hurd/getdport.c
+++ b/hurd/getdport.c
@@ -41,8 +41,8 @@ __getdport (int fd)
       return MACH_PORT_NULL;
     }
 
-  if (fd < 0 || (unsigned int) fd > _hurd_init_dtablesize ||
-      _hurd_init_dtable[fd] == MACH_PORT_NULL)
+  if (fd < 0 || (unsigned int) fd > _hurd_init_dtablesize
+      || _hurd_init_dtable[fd] == MACH_PORT_NULL)
     {
       errno = EBADF;
       return MACH_PORT_NULL;
diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h
index 69020a439b..c30f536436 100644
--- a/hurd/hurd/signal.h
+++ b/hurd/hurd/signal.h
@@ -379,8 +379,8 @@ extern mach_msg_timeout_t _hurd_interrupted_rpc_timeout;
 	__mach_port_deallocate (__mach_task_self (), msgport);		      \
 	if ((dealloc_refport) && refport != MACH_PORT_NULL)		      \
 	  __mach_port_deallocate (__mach_task_self (), refport);    	      \
-      } while (__err == MACH_SEND_INVALID_DEST ||			      \
-	       __err == MIG_SERVER_DIED);				      \
+      } while (__err == MACH_SEND_INVALID_DEST				      \
+	       || __err == MIG_SERVER_DIED);				      \
     __err;								      \
 })
 
diff --git a/hurd/hurd/sigpreempt.h b/hurd/hurd/sigpreempt.h
index 29b3619fb0..44eb614e13 100644
--- a/hurd/hurd/sigpreempt.h
+++ b/hurd/hurd/sigpreempt.h
@@ -51,8 +51,8 @@ struct hurd_signal_preemptor
   };
 
 #define HURD_PREEMPT_SIGNAL_P(preemptor, signo, sigcode) \
-  (((preemptor)->signals & sigmask (signo)) && \
-   (sigcode) >= (preemptor)->first && (sigcode) <= (preemptor)->last)
+  (((preemptor)->signals & sigmask (signo)) \
+   && (sigcode) >= (preemptor)->first && (sigcode) <= (preemptor)->last)
 
 
 /* Signal preemptors applying to all threads; locked by _hurd_siglock.  */
diff --git a/hurd/hurdfault.c b/hurd/hurdfault.c
index 63f899e711..ea248d0b55 100644
--- a/hurd/hurdfault.c
+++ b/hurd/hurdfault.c
@@ -52,8 +52,8 @@ _hurdsig_fault_catch_exception_raise (mach_port_t port,
   int signo;
   struct hurd_signal_detail d;
 
-  if (port != forward_sigexc ||
-      thread != _hurd_msgport_thread || task != __mach_task_self ())
+  if (port != forward_sigexc
+      || thread != _hurd_msgport_thread || task != __mach_task_self ())
     return EPERM;		/* Strange bogosity.  */
 
   d.exc = exception;
diff --git a/hurd/hurdioctl.c b/hurd/hurdioctl.c
index 756d96ef56..2d7a685409 100644
--- a/hurd/hurdioctl.c
+++ b/hurd/hurdioctl.c
@@ -78,16 +78,16 @@ fioctl (int fd,
       break;
 
     case FIONBIO:
-      err = HURD_DPORT_USE (fd, (*arg ?
-				 __io_set_some_openmodes :
-				 __io_clear_some_openmodes)
+      err = HURD_DPORT_USE (fd, (*arg
+				 ? __io_set_some_openmodes
+				 : __io_clear_some_openmodes)
 			    (port, O_NONBLOCK));
       break;
 
     case FIOASYNC:
-      err = HURD_DPORT_USE (fd, (*arg ?
-				 __io_set_some_openmodes :
-				 __io_clear_some_openmodes)
+      err = HURD_DPORT_USE (fd, (*arg
+				 ? __io_set_some_openmodes
+				 : __io_clear_some_openmodes)
 			    (port, O_ASYNC));
       break;
 
diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c
index 22aac59d68..6997b2b73b 100644
--- a/hurd/hurdselect.c
+++ b/hurd/hurdselect.c
@@ -81,8 +81,8 @@ _hurd_select (int nfds,
 	  return -1;
 	}
 
-      to = (timeout->tv_sec * 1000 +
-            (timeout->tv_nsec + 999999) / 1000000);
+      to = (timeout->tv_sec * 1000
+            + (timeout->tv_nsec + 999999) / 1000000);
     }
 
   if (sigmask && __sigprocmask (SIG_SETMASK, sigmask, &oset))
@@ -347,30 +347,30 @@ _hurd_select (int nfds,
 	    { MACH_MSG_TYPE_INTEGER_T, sizeof (integer_t) * 8, 1, 1, 0, 0 }
 	  };
 #endif
-	  if (msg.head.msgh_id == IO_SELECT_REPLY_MSGID &&
-	      msg.head.msgh_size >= sizeof msg.error &&
-	      !(msg.head.msgh_bits & MACH_MSGH_BITS_COMPLEX) &&
+	  if (msg.head.msgh_id == IO_SELECT_REPLY_MSGID
+	      && msg.head.msgh_size >= sizeof msg.error
+	      && !(msg.head.msgh_bits & MACH_MSGH_BITS_COMPLEX)
 #ifdef MACH_MSG_TYPE_BIT
-	      msg.error.err_type.word == inttype.word
+	      && msg.error.err_type.word == inttype.word
 #endif
 	      )
 	    {
 	      /* This is a properly formatted message so far.
 		 See if it is a success or a failure.  */
-	      if (msg.error.err == EINTR &&
-		  msg.head.msgh_size == sizeof msg.error)
+	      if (msg.error.err == EINTR
+		  && msg.head.msgh_size == sizeof msg.error)
 		{
 		  /* EINTR response; poll for further responses
 		     and then return quickly.  */
 		  err = EINTR;
 		  goto poll;
 		}
-	      if (msg.error.err ||
-		  msg.head.msgh_size != sizeof msg.success ||
+	      if (msg.error.err
+		  || msg.head.msgh_size != sizeof msg.success
 #ifdef MACH_MSG_TYPE_BIT
-		  msg.success.result_type.word != inttype.word ||
+		  || msg.success.result_type.word != inttype.word
 #endif
-		  (msg.success.result & SELECT_ALL) == 0)
+		  || (msg.success.result & SELECT_ALL) == 0)
 		{
 		  /* Error or bogus reply.  Simulate readiness.  */
 		  __mach_msg_destroy (&msg.head);
diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index 1e4b3466ce..86c1179c02 100644
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -309,8 +309,8 @@ _hurdsig_abort_rpcs (struct hurd_sigstate *ss, int signo, int sigthread,
      receive completes immediately or aborts.  */
   abort_thread (ss, state, reply);
 
-  if (state->basic.PC >= (natural_t) &_hurd_intr_rpc_msg_about_to &&
-      state->basic.PC <  (natural_t) &_hurd_intr_rpc_msg_in_trap)
+  if (state->basic.PC >= (natural_t) &_hurd_intr_rpc_msg_about_to
+      && state->basic.PC < (natural_t) &_hurd_intr_rpc_msg_in_trap)
     {
       /* The thread is about to do the RPC, but hasn't yet entered
 	 mach_msg.  Mutate the thread's state so it knows not to try
@@ -321,11 +321,11 @@ _hurdsig_abort_rpcs (struct hurd_sigstate *ss, int signo, int sigthread,
       state->basic.SYSRETURN = MACH_SEND_INTERRUPTED;
       *state_change = 1;
     }
-  else if (state->basic.PC == (natural_t) &_hurd_intr_rpc_msg_in_trap &&
+  else if (state->basic.PC == (natural_t) &_hurd_intr_rpc_msg_in_trap
 	   /* The thread was blocked in the system call.  After thread_abort,
 	      the return value register indicates what state the RPC was in
 	      when interrupted.  */
-	   state->basic.SYSRETURN == MACH_RCV_INTERRUPTED)
+	   && state->basic.SYSRETURN == MACH_RCV_INTERRUPTED)
       {
 	/* The RPC request message was sent and the thread was waiting for
 	   the reply message; now the message receive has been aborted, so
@@ -462,8 +462,8 @@ sigset_t _hurdsig_preempted_set;
 weak_alias (_hurdsig_preemptors, _hurdsig_preempters)
 
 /* Mask of stop signals.  */
-#define STOPSIGS (sigmask (SIGTTIN) | sigmask (SIGTTOU) | \
-		  sigmask (SIGSTOP) | sigmask (SIGTSTP))
+#define STOPSIGS (sigmask (SIGTTIN) | sigmask (SIGTTOU) \
+		  | sigmask (SIGSTOP) | sigmask (SIGTSTP))
 
 /* Deliver a signal.  SS is not locked.  */
 void
diff --git a/hurd/hurdstartup.c b/hurd/hurdstartup.c
index b2a668dcd2..a028151b8f 100644
--- a/hurd/hurdstartup.c
+++ b/hurd/hurdstartup.c
@@ -127,9 +127,9 @@ _hurd_startup (void **argptr, void (*main) (intptr_t *data))
 	 pointers and fill them in.  We allocate the space for the
 	 environment pointers immediately after the argv pointers because
 	 the ELF ABI will expect it.  */
-      argcptr = __alloca (sizeof (intptr_t) +
-			  (argc + 1 + envc + 1) * sizeof (char *) +
-			  sizeof (struct hurd_startup_data));
+      argcptr = __alloca (sizeof (intptr_t)
+			  + (argc + 1 + envc + 1) * sizeof (char *)
+			  + sizeof (struct hurd_startup_data));
       *argcptr = argc;
       argv = (void *) (argcptr + 1);
       __argz_extract (args, argslen, argv);
diff --git a/hurd/intr-msg.c b/hurd/intr-msg.c
index 1f09c92d92..b7fda2188f 100644
--- a/hurd/intr-msg.c
+++ b/hurd/intr-msg.c
@@ -362,12 +362,12 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg,
 		 1, TRUE, FALSE, FALSE, 0 } };
 #endif
 
-        if (m->reply.RetCode == EINTR &&
-	    m->header.msgh_size == sizeof m->reply &&
+        if (m->reply.RetCode == EINTR
+	    && m->header.msgh_size == sizeof m->reply
 #ifdef MACH_MSG_TYPE_BIT
-	    m->check.type == check.i &&
+	    && m->check.type == check.i
 #endif
-	    !(m->header.msgh_bits & MACH_MSGH_BITS_COMPLEX))
+	    && !(m->header.msgh_bits & MACH_MSGH_BITS_COMPLEX))
 	  {
 	    /* It is indeed EINTR.  Is the interrupt for us?  */
 	    if (ss->intr_port != MACH_PORT_NULL)
diff --git a/hurd/lookup-retry.c b/hurd/lookup-retry.c
index c5c2937095..06cf8393a8 100644
--- a/hurd/lookup-retry.c
+++ b/hurd/lookup-retry.c
@@ -121,10 +121,10 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port)
 	    }
 
 	  /* An empty RETRYNAME indicates we have the final port.  */
-	  if (retryname[0] == '\0' &&
+	  if (retryname[0] == '\0'
 	      /* If reauth'd, we must do one more retry on "" to give the new
 		 translator a chance to make a new port for us.  */
-	      doretry == FS_RETRY_NORMAL)
+	      && doretry == FS_RETRY_NORMAL)
 	    {
 	      if (flags & O_NOFOLLOW)
 		{
@@ -258,10 +258,10 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port)
 	      break;
 
 	    case 'm':
-	      if (retryname[1] == 'a' && retryname[2] == 'c' &&
-		  retryname[3] == 'h' && retryname[4] == 't' &&
-		  retryname[5] == 'y' && retryname[6] == 'p' &&
-		  retryname[7] == 'e')
+	      if (retryname[1] == 'a' && retryname[2] == 'c'
+		  && retryname[3] == 'h' && retryname[4] == 't'
+		  && retryname[5] == 'y' && retryname[6] == 'p'
+		  && retryname[7] == 'e')
 		{
 		  error_t err;
 		  struct host_basic_info hostinfo;
diff --git a/hurd/msgportdemux.c b/hurd/msgportdemux.c
index a08a16a665..039b395933 100644
--- a/hurd/msgportdemux.c
+++ b/hurd/msgportdemux.c
@@ -46,8 +46,8 @@ msgport_server (mach_msg_header_t *inp,
     if ((*d->demux) (inp, outp))
       return 1;
 
-  return (_S_exc_server (inp, outp) ||
-	  _S_msg_server (inp, outp));
+  return (_S_exc_server (inp, outp)
+	  || _S_msg_server (inp, outp));
 }
 
 /* This is the code that the signal thread runs.  */
diff --git a/hurd/setauth.c b/hurd/setauth.c
index 3d82208ce6..0476cde2da 100644
--- a/hurd/setauth.c
+++ b/hurd/setauth.c
@@ -67,12 +67,12 @@ _hurd_setauth (auth_t new)
 	  mach_port_t new;
 	  ref = __mach_reply_port ();
 	  if (! __io_reauthenticate (_hurd_init_dtable[d],
-				     ref, MACH_MSG_TYPE_MAKE_SEND) &&
-	      ! HURD_PORT_USE (&_hurd_ports[INIT_PORT_AUTH],
-			       __auth_user_authenticate
-			       (port,
-				ref, MACH_MSG_TYPE_MAKE_SEND,
-				&new)))
+				     ref, MACH_MSG_TYPE_MAKE_SEND)
+	      && ! HURD_PORT_USE (&_hurd_ports[INIT_PORT_AUTH],
+				  __auth_user_authenticate
+				  (port,
+				   ref, MACH_MSG_TYPE_MAKE_SEND,
+				   &new)))
 	    {
 	      __mach_port_deallocate (__mach_task_self (),
 				      _hurd_init_dtable[d]);
@@ -84,20 +84,20 @@ _hurd_setauth (auth_t new)
   ref = __mach_reply_port ();
   if (__USEPORT (CRDIR,
 		 ! __io_reauthenticate (port,
-					ref, MACH_MSG_TYPE_MAKE_SEND) &&
-		 ! __auth_user_authenticate (new,
-					     ref, MACH_MSG_TYPE_MAKE_SEND,
-					     &newport)))
+					ref, MACH_MSG_TYPE_MAKE_SEND)
+		 && ! __auth_user_authenticate (new,
+						ref, MACH_MSG_TYPE_MAKE_SEND,
+						&newport)))
     _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], newport);
   __mach_port_destroy (__mach_task_self (), ref);
 
   ref = __mach_reply_port ();
   if (__USEPORT (CWDIR,
 		 ! __io_reauthenticate (port,
-					ref, MACH_MSG_TYPE_MAKE_SEND) &&
-		 ! __auth_user_authenticate (new,
-					     ref, MACH_MSG_TYPE_MAKE_SEND,
-					     &newport)))
+					ref, MACH_MSG_TYPE_MAKE_SEND)
+		 && ! __auth_user_authenticate (new,
+						ref, MACH_MSG_TYPE_MAKE_SEND,
+						&newport)))
     _hurd_port_set (&_hurd_ports[INIT_PORT_CWDIR], newport);
   __mach_port_destroy (__mach_task_self (), ref);