patch-2.4.3 linux/drivers/isdn/avmb1/b1.c
Next file: linux/drivers/isdn/avmb1/b1dma.c
Previous file: linux/drivers/isdn/avmb1/avm_cs.c
Back to the patch index
Back to the overall index
- Lines: 50
- Date:
Sun Mar 25 18:20:44 2001
- Orig file:
v2.4.2/linux/drivers/isdn/avmb1/b1.c
- Orig date:
Tue Nov 28 21:43:13 2000
diff -u --recursive --new-file v2.4.2/linux/drivers/isdn/avmb1/b1.c linux/drivers/isdn/avmb1/b1.c
@@ -1,11 +1,20 @@
/*
- * $Id: b1.c,v 1.20 2000/11/23 20:45:14 kai Exp $
+ * $Id: b1.c,v 1.20.6.3 2001/03/21 08:52:20 kai Exp $
*
* Common module for AVM B1 cards.
*
* (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
*
* $Log: b1.c,v $
+ * Revision 1.20.6.3 2001/03/21 08:52:20 kai
+ * merge from main branch: fix buffer for revision string (calle)
+ *
+ * Revision 1.20.6.2 2001/03/15 15:11:23 kai
+ * *** empty log message ***
+ *
+ * Revision 1.20.6.1 2001/02/13 11:43:29 kai
+ * more compatility changes for 2.2.19
+ *
* Revision 1.20 2000/11/23 20:45:14 kai
* fixed module_init/exit stuff
* Note: compiled-in kernel doesn't work pre 2.2.18 anymore.
@@ -117,7 +126,7 @@
#include "capicmd.h"
#include "capiutil.h"
-static char *revision = "$Revision: 1.20 $";
+static char *revision = "$Revision: 1.20.6.3 $";
/* ------------------------------------------------------------- */
@@ -747,12 +756,13 @@
static int __init b1_init(void)
{
char *p;
- char rev[10];
+ char rev[32];
- if ((p = strchr(revision, ':'))) {
- strncpy(rev, p + 1, sizeof(rev));
- p = strchr(rev, '$');
- *p = 0;
+ if ((p = strchr(revision, ':')) != 0 && p[1]) {
+ strncpy(rev, p + 2, sizeof(rev));
+ rev[sizeof(rev)-1] = 0;
+ if ((p = strchr(rev, '$')) != 0 && p > rev)
+ *(p-1) = 0;
} else
strcpy(rev, "1.0");
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)