remove trailing whitespace

Author: a1346054

src/crypto/base64.cc

@@ -110,7 +110,7 @@ void base64_encode( const uint8_t *raw, const size_t raw_len,
     raw += 3;
     b64 += 4;
   }
-  
+
   /* last byte of input, last 4 of output */
   uint8_t lastchar = *raw;
   b64[0] = table[(lastchar >> 2) & 0x3f];

src/crypto/crypto.cc

@@ -143,7 +143,7 @@ Base64Key::Base64Key(PRNG &prng)
 string Base64Key::printable_key( void ) const
 {
   char base64[ 24 ];
-  
+
   base64_encode( key, 16, base64, 24 );
 
   if ( (base64[ 23 ] != '=')

src/crypto/crypto.h

@@ -110,17 +110,17 @@ namespace Crypto {
   public:
     Nonce( uint64_t val );
     Nonce( const char *s_bytes, size_t len );
-    
+
     string cc_str( void ) const { return string( bytes + 4, 8 ); }
     const char *data( void ) const { return bytes; }
     uint64_t val( void ) const;
   };
-  
+
   class Message {
   public:
     const Nonce nonce;
     const string text;
-    
+
     Message( const char *nonce_bytes, size_t nonce_len,
 	     const char *text_bytes, size_t text_len )
       : nonce( nonce_bytes, nonce_len ),
@@ -130,7 +130,7 @@ namespace Crypto {
       : nonce( s_nonce ),
       text( s_text ) {}
   };
-  
+
   class Session {
   private:
     Base64Key key;
@@ -141,21 +141,21 @@ namespace Crypto {
     AlignedBuffer plaintext_buffer;
     AlignedBuffer ciphertext_buffer;
     AlignedBuffer nonce_buffer;
-    
+
   public:
     static const int RECEIVE_MTU = 2048;
     /* Overhead (not counting the nonce, which is handled by network transport) */
     static const int ADDED_BYTES = 16 /* final OCB block */;
 
     Session( Base64Key s_key );
     ~Session();
-    
+
     const string encrypt( const Message & plaintext );
     const Message decrypt( const char *str, size_t len );
     const Message decrypt( const string & ciphertext ) {
       return decrypt( ciphertext.data(), ciphertext.size() );
     }
-    
+
     Session( const Session & );
     Session & operator=( const Session & );
   };

src/examples/ntester.cc

@@ -56,11 +56,11 @@ int main( int argc, char *argv[] )
     if ( argc > 1 ) {
       server = false;
       /* client */
-      
+
       key = argv[ 1 ];
       ip = argv[ 2 ];
       port = argv[ 3 ];
-      
+
       raw_n = new Transport<UserStream, UserStream>( me, remote, key, ip, port );
     } else {
       raw_n = new Transport<UserStream, UserStream>( me, remote, NULL, NULL );
@@ -86,7 +86,7 @@ int main( int argc, char *argv[] )
 	  perror( "select" );
 	  exit( 1 );
 	}
-	
+
 	n->tick();
 
 	if ( sel.read( network_fd ) ) {
@@ -167,6 +167,6 @@ int main( int argc, char *argv[] )
     if ( tcsetattr( STDIN_FILENO, TCSANOW, &saved_termios ) < 0 ) {
       perror( "tcsetattr" );
       exit( 1 );
-    }    
+    }
   }
 }

src/examples/termemu.cc

@@ -266,13 +266,13 @@ static void emulate_terminal( int fd )
 	perror( "read" );
 	return;
       }
-      
+
       std::string terminal_to_host;
-      
+
       for ( int i = 0; i < bytes_read; i++ ) {
 	terminal_to_host += complete.act( Parser::UserByte( buf[ i ] ) );
       }
-      
+
       if ( swrite( fd, terminal_to_host.c_str(), terminal_to_host.length() ) < 0 ) {
 	break;
       }
@@ -288,7 +288,7 @@ static void emulate_terminal( int fd )
 	perror( "read" );
 	return;
       }
-      
+
       std::string terminal_to_host = complete.act( std::string( buf, bytes_read ) );
       if ( swrite( fd, terminal_to_host.c_str(), terminal_to_host.length() ) < 0 ) {
 	break;

src/frontend/mosh-server.cc

@@ -728,12 +728,12 @@ static void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &
       if ( sel.read( network_fd ) ) {
 	/* packet received from the network */
 	network.recv();
-	
+
 	/* is new user input available for the terminal? */
 	if ( network.get_remote_state_num() != last_remote_num ) {
 	  last_remote_num = network.get_remote_state_num();
 
-	  
+
 	  Network::UserStream us;
 	  us.apply_string( network.get_remote_diff() );
 	  /* apply userstream to terminal */
@@ -828,12 +828,12 @@ static void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &
 	  }
 	}
       }
-      
+
       if ( (!network.shutdown_in_progress()) && sel.read( host_fd ) ) {
 	/* input from the host needs to be fed to the terminal */
 	const int buf_size = 16384;
 	char buf[ buf_size ];
-	
+
 	/* fill buffer if possible */
 	ssize_t bytes_read = read( host_fd, buf, buf_size );
 
@@ -843,7 +843,7 @@ static void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &
 	  network.start_shutdown();
 	} else {
 	  terminal_to_host += terminal.act( string( buf, bytes_read ) );
-	
+
 	  /* update client with new state of terminal */
 	  network.set_current_state( terminal );
 	}
@@ -858,7 +858,7 @@ static void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &
       if ( network_timeout_ms &&
 	   network_timeout_ms <= time_since_remote_state ) {
 	idle_shutdown = true;
-	fprintf( stderr, "Network idle for %llu seconds.\n", 
+	fprintf( stderr, "Network idle for %llu seconds.\n",
 		 static_cast<unsigned long long>( time_since_remote_state / 1000 ) );
       }
       if ( sel.signal( SIGUSR1 )
@@ -876,7 +876,7 @@ static void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &
 	  break;
 	}
       }
-      
+
       /* quit if our shutdown has been acknowledged */
       if ( network.shutdown_in_progress() && network.shutdown_acknowledged() ) {
 	break;
@@ -894,7 +894,7 @@ static void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &
 
       #ifdef HAVE_UTEMPTER
       /* update utmp if has been more than 30 seconds since heard from client */
-      if ( connected_utmp 
+      if ( connected_utmp
 	   && time_since_remote_state > 30000 ) {
 	utempter_remove_record( host_fd );
 

src/frontend/stmclient.cc

@@ -208,7 +208,7 @@ void STMClient::shutdown( void )
 
   /* Restore terminal and terminal-driver state */
   swrite( STDOUT_FILENO, display.close().c_str() );
-  
+
   if ( tcsetattr( STDIN_FILENO, TCSANOW, &saved_termios ) < 0 ) {
     perror( "tcsetattr" );
     exit( 1 );
@@ -239,7 +239,7 @@ void STMClient::main_init( void )
   if ( ioctl( STDIN_FILENO, TIOCGWINSZ, &window_size ) < 0 ) {
     perror( "ioctl TIOCGWINSZ" );
     return;
-  }  
+  }
 
   /* local state */
   local_framebuffer = Terminal::Framebuffer( window_size.ws_col, window_size.ws_row );
@@ -290,7 +290,7 @@ void STMClient::output_new_frame( void )
 void STMClient::process_network_input( void )
 {
   network->recv();
-  
+
   /* Now give hints to the overlays */
   overlays.get_notification_engine().server_heard( network->get_latest_remote_state().timestamp );
   overlays.get_notification_engine().server_acked( network->get_sent_state_acked_timestamp() );
@@ -366,7 +366,7 @@ bool STMClient::process_user_input( int fd )
       } else {
 	/* Escape key followed by anything other than . and ^ gets sent literally */
 	net.get_current_state().push_back( Parser::UserByte( escape_key ) );
-	net.get_current_state().push_back( Parser::UserByte( the_byte ) );	  
+	net.get_current_state().push_back( Parser::UserByte( the_byte ) );
       }
 
       quit_sequence_started = false;
@@ -391,7 +391,7 @@ bool STMClient::process_user_input( int fd )
       repaint_requested = true;
     }
 
-    net.get_current_state().push_back( Parser::UserByte( the_byte ) );		
+    net.get_current_state().push_back( Parser::UserByte( the_byte ) );
   }
 
   return true;
@@ -404,16 +404,16 @@ bool STMClient::process_resize( void )
     perror( "ioctl TIOCGWINSZ" );
     return false;
   }
-  
+
   /* tell remote emulator */
   Parser::Resize res( window_size.ws_col, window_size.ws_row );
-  
+
   if ( !network->shutdown_in_progress() ) {
     network->get_current_state().push_back( res );
   }
 
   /* note remote emulator will probably reply with its own Resize to adjust our state */
-  
+
   /* tell prediction engine */
   overlays.get_prediction_engine().reset();
 
@@ -480,7 +480,7 @@ bool STMClient::main( void )
       if ( network_ready_to_read ) {
 	process_network_input();
       }
-    
+
       if ( sel.read( STDIN_FILENO ) && !process_user_input( STDIN_FILENO ) ) { /* input from the user needs to be fed to the network */
 	if ( !network->has_remote_addr() ) {
 	  break;
@@ -577,4 +577,3 @@ bool STMClient::main( void )
   }
   return clean_shutdown;
 }
-

src/frontend/stmclient.h

@@ -122,7 +122,7 @@ class STMClient {
     }
     if ( predict_overwrite && !strcmp( predict_overwrite, "yes" ) ) {
       overlays.get_prediction_engine().set_predict_overwrite( true );
-    } 
+    }
   }
 
   void init( void );

src/frontend/terminaloverlay.cc

@@ -272,7 +272,7 @@ void NotificationEngine::apply( Framebuffer &fb ) const
       this_cell->get_renditions().set_attribute(Renditions::bold, true);
       this_cell->get_renditions().set_foreground_color( 7 );
       this_cell->get_renditions().set_background_color( 4 );
-      
+
       this_cell->append( ch );
       this_cell->set_wide( chwidth == 2 );
       combining_cell = this_cell;
@@ -306,7 +306,7 @@ void NotificationEngine::adjust_message( void )
 {
   if ( timestamp() >= message_expiration ) {
     message.clear();
-  }  
+  }
 }
 
 int NotificationEngine::wait_time( void ) const
@@ -420,7 +420,7 @@ void PredictionEngine::init_cursor( const Framebuffer &fb )
 {
   if ( cursors.empty() ) {
     /* initialize new cursor prediction */
-    
+
     cursors.push_back( ConditionalCursorMove( local_frame_sent + 1,
 					      fb.ds.get_cursor_row(),
 					      fb.ds.get_cursor_col(),
@@ -552,7 +552,7 @@ void PredictionEngine::cull( const Framebuffer &fb )
 	}
 
 	/* When predictions come in quickly, slowly take away the glitch trigger. */
-	if ( now - j->prediction_time < GLITCH_THRESHOLD 
+	if ( now - j->prediction_time < GLITCH_THRESHOLD
 	     && ( glitch_trigger > 0 && now - GLITCH_REPAIR_MININTERVAL >= last_quick_confirmation ) ) {
 	  glitch_trigger--;
 	  last_quick_confirmation = now;
@@ -593,7 +593,7 @@ void PredictionEngine::cull( const Framebuffer &fb )
   }
 
   /* go through cursor predictions */
-  if ( !cursors.empty() 
+  if ( !cursors.empty()
        && cursor().get_validity( fb,
 				local_frame_acked, local_frame_late_acked ) == IncorrectOrExpired ) {
     /*
@@ -721,7 +721,7 @@ void PredictionEngine::new_user_byte( char the_byte, const Framebuffer &fb )
 	      cell.tentative_until_epoch = prediction_epoch;
 	      cell.expire( local_frame_sent + 1, now );
 	      cell.original_contents.push_back( *fb.get_cell( cursor().row, i ) );
-	  
+
 	      if ( i + 2 < fb.ds.get_width() ) {
 		ConditionalOverlayCell &next_cell = the_row.overlay_cells[ i + 1 ];
 		const Cell *next_cell_actual = fb.get_cell( cursor().row, i + 1 );
@@ -788,7 +788,7 @@ void PredictionEngine::new_user_byte( char the_byte, const Framebuffer &fb )
 	    cell.replacement = *prev_cell_actual;
 	  }
 	}
-	
+
 	ConditionalOverlayCell &cell = the_row.overlay_cells[ cursor().col ];
 	cell.reset_with_orig();
 	cell.active = true;
@@ -834,7 +834,7 @@ void PredictionEngine::new_user_byte( char the_byte, const Framebuffer &fb )
 	newline_carriage_return( fb );
       } else {
 	//	fprintf( stderr, "Execute 0x%x\n", act.ch );
-	become_tentative();	
+	become_tentative();
       }
     } else if ( type_act == typeid( Parser::Esc_Dispatch ) ) {
       //      fprintf( stderr, "Escape sequence\n" );
@@ -848,7 +848,7 @@ void PredictionEngine::new_user_byte( char the_byte, const Framebuffer &fb )
 	}
       } else if ( act.char_present && (act.ch == L'D') ) { /* left arrow */
 	init_cursor( fb );
-	
+
 	if ( cursor().col > 0 ) {
 	  cursor().col--;
 	  cursor().expire( local_frame_sent + 1, now );

src/include/Makefile.am

@@ -11,4 +11,3 @@ version.h:	../../VERSION
 		mv -f $@.new $@; \
 	fi
 	@rm -f $@.new
-