[or-cvs] Add magic to end of C files to make emacs happy; split test...
Nick Mathewson
nickm at seul.org
Mon Apr 7 02:12:06 UTC 2003
Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv12823/src/or
Modified Files:
Makefile.am buffers.c circuit.c command.c config.c
connection.c connection_ap.c connection_exit.c connection_op.c
connection_or.c directory.c dns.c main.c onion.c or.h
routers.c
Added Files:
test.c tor_main.c
Log Message:
Add magic to end of C files to make emacs happy; split test invocation into separate file.
--- NEW FILE: test.c ---
/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */
/* See LICENSE for licensing information */
/* $Id: test.c,v 1.1 2003/04/07 02:12:02 nickm Exp $ */
int main(int c, char**v) {
return 0;
}
/*
Local Variables:
mode:c
indent-tabs-mode:nil
c-basic-offset:2
End:
*/
--- NEW FILE: tor_main.c ---
/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */
/* See LICENSE for licensing information */
/* $Id: tor_main.c,v 1.1 2003/04/07 02:12:02 nickm Exp $ */
int tor_main(int argc, char *argv[]);
int main(int argc, char *argv[])
{
return tor_main(argc, argv);
}
/*
Local Variables:
mode:c
indent-tabs-mode:nil
c-basic-offset:2
End:
*/
Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/src/or/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.am 19 Mar 2003 20:42:40 -0000 1.13
+++ Makefile.am 7 Apr 2003 02:12:02 -0000 1.14
@@ -1,19 +1,22 @@
+TESTS = test
-TESTS = test_config
-
-noinst_PROGRAMS = test_config
+noinst_PROGRAMS = test
bin_PROGRAMS = or
-or_LDADD = -L../common -lor -lz
-
or_SOURCES = buffers.c circuit.c command.c connection.c \
connection_exit.c connection_ap.c connection_op.c connection_or.c config.c \
- main.c onion.c routers.c directory.c dns.c
+ onion.c routers.c directory.c dns.c \
+ main.c tor_main.c
-test_config_SOURCES = test_config.c config.c
+or_LDADD = -L../common -lor -lz
-test_config_LDADD = -L../common -lor
+test_SOURCES = buffers.c circuit.c command.c connection.c \
+ connection_exit.c connection_ap.c connection_op.c connection_or.c config.c \
+ onion.c routers.c directory.c dns.c \
+ main.c test.c
+
+test_LDADD = -L../common -lor -lz
noinst_HEADERS = or.h tree.h
Index: buffers.c
===================================================================
RCS file: /home/or/cvsroot/src/or/buffers.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- buffers.c 24 Mar 2003 03:00:20 -0000 1.17
+++ buffers.c 7 Apr 2003 02:12:02 -0000 1.18
@@ -252,3 +252,10 @@
return -1;
}
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: circuit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuit.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- circuit.c 11 Mar 2003 21:38:38 -0000 1.27
+++ circuit.c 7 Apr 2003 02:12:02 -0000 1.28
@@ -631,3 +631,10 @@
}
}
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: command.c
===================================================================
RCS file: /home/or/cvsroot/src/or/command.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- command.c 10 Mar 2003 22:30:05 -0000 1.19
+++ command.c 7 Apr 2003 02:12:02 -0000 1.20
@@ -300,3 +300,10 @@
circuit_free(circ);
}
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/config.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- config.c 19 Mar 2003 22:02:35 -0000 1.28
+++ config.c 7 Apr 2003 02:12:02 -0000 1.29
@@ -369,3 +369,10 @@
return result;
}
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- connection.c 24 Mar 2003 03:00:20 -0000 1.49
+++ connection.c 7 Apr 2003 02:12:02 -0000 1.50
@@ -904,3 +904,10 @@
return connection_process_inbuf(conn); /* process the remainder of the buffer */
}
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: connection_ap.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_ap.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- connection_ap.c 5 Apr 2003 19:04:47 -0000 1.32
+++ connection_ap.c 7 Apr 2003 02:12:02 -0000 1.33
@@ -539,3 +539,11 @@
log(LOG_NOTICE,"AP: Received a connection request. Waiting for socksinfo.");
return connection_handle_listener_read(conn, CONN_TYPE_AP, AP_CONN_STATE_SOCKS_WAIT);
}
+
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: connection_exit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_exit.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- connection_exit.c 5 Apr 2003 19:04:47 -0000 1.28
+++ connection_exit.c 7 Apr 2003 02:12:02 -0000 1.29
@@ -389,3 +389,10 @@
return connection_exit_send_connected(conn);
}
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: connection_op.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_op.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- connection_op.c 19 Mar 2003 21:17:57 -0000 1.13
+++ connection_op.c 7 Apr 2003 02:12:02 -0000 1.14
@@ -121,3 +121,10 @@
return connection_handle_listener_read(conn, CONN_TYPE_OP, OP_CONN_STATE_AWAITING_KEYS);
}
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: connection_or.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_or.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- connection_or.c 24 Mar 2003 02:50:07 -0000 1.23
+++ connection_or.c 7 Apr 2003 02:12:02 -0000 1.24
@@ -740,3 +740,10 @@
return connection_handle_listener_read(conn, CONN_TYPE_OR, OR_CONN_STATE_SERVER_AUTH_WAIT);
}
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: directory.c
===================================================================
RCS file: /home/or/cvsroot/src/or/directory.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- directory.c 18 Mar 2003 01:49:55 -0000 1.8
+++ directory.c 7 Apr 2003 02:12:02 -0000 1.9
@@ -293,3 +293,10 @@
return connection_handle_listener_read(conn, CONN_TYPE_DIR, DIR_CONN_STATE_COMMAND_WAIT);
}
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: dns.c
===================================================================
RCS file: /home/or/cvsroot/src/or/dns.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dns.c 5 Apr 2003 19:53:45 -0000 1.8
+++ dns.c 7 Apr 2003 02:12:02 -0000 1.9
@@ -568,3 +568,10 @@
return 0;
}
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- main.c 18 Mar 2003 01:49:55 -0000 1.45
+++ main.c 7 Apr 2003 02:12:02 -0000 1.46
@@ -626,7 +626,7 @@
fclose(stderr);
}
-int main(int argc, char *argv[]) {
+int tor_main(int argc, char *argv[]) {
int retval = 0;
if(getconfig(argc,argv,&options))
@@ -657,3 +657,10 @@
return retval;
}
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: onion.c
===================================================================
RCS file: /home/or/cvsroot/src/or/onion.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- onion.c 19 Mar 2003 20:48:56 -0000 1.30
+++ onion.c 7 Apr 2003 02:12:02 -0000 1.31
@@ -809,3 +809,10 @@
return 0;
}
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- or.h 24 Mar 2003 04:02:24 -0000 1.56
+++ or.h 7 Apr 2003 02:12:02 -0000 1.57
@@ -775,3 +775,11 @@
int router_get_list_from_string(char *s);
#endif
+
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
Index: routers.c
===================================================================
RCS file: /home/or/cvsroot/src/or/routers.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- routers.c 18 Mar 2003 01:49:55 -0000 1.18
+++ routers.c 7 Apr 2003 02:12:02 -0000 1.19
@@ -532,3 +532,10 @@
}
#endif
+/*
+ Local Variables:
+ mode:c
+ indent-tabs-mode:nil
+ c-basic-offset:2
+ End:
+*/
More information about the tor-commits
mailing list