summaryrefslogtreecommitdiff
path: root/mgetty/mgetty-1.1.30/40-locks.c_bug153394
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
committerChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
commit2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch)
treebf879bea7ef8517ba8c3d1286ef300401d3d484c /mgetty/mgetty-1.1.30/40-locks.c_bug153394
parent101e2f1623def0a355d20aacb8bd93810703e834 (diff)
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'mgetty/mgetty-1.1.30/40-locks.c_bug153394')
-rw-r--r--mgetty/mgetty-1.1.30/40-locks.c_bug15339460
1 files changed, 0 insertions, 60 deletions
diff --git a/mgetty/mgetty-1.1.30/40-locks.c_bug153394 b/mgetty/mgetty-1.1.30/40-locks.c_bug153394
deleted file mode 100644
index 0de2fb6b0f..0000000000
--- a/mgetty/mgetty-1.1.30/40-locks.c_bug153394
+++ /dev/null
@@ -1,60 +0,0 @@
---- mgetty-1.1.28.old/locks.c 2001-01-06 12:46:34.000000000 -0500
-+++ mgetty-1.1.28/locks.c 2002-08-03 16:25:02.000000000 -0400
-@@ -394,9 +394,42 @@
-
- #else /* not SVR4 */
-
-+static char * unslash_name _P1 ( (device),
-+ char *device )
-+{
-+ char *lock_device, *ldev_begin, *ldevice_orig;
-+
-+ ldevice_orig = malloc( strlen (device) + 1 );
-+ sprintf( ldevice_orig, "%s", device );
-+
-+ lock_device = strchr( ldevice_orig, '/' );
-+ while (lock_device)
-+ {
-+ *lock_device = '_';
-+ lock_device = strchr( lock_device, '/' );
-+ }
-+
-+ if ( *ldevice_orig == '_' )
-+ {
-+ lock_device = strchr( ldevice_orig + 1, '_' );
-+ if (! lock_device)
-+ lock_device = ldevice_orig;
-+ lock_device++;
-+ }
-+ else
-+ lock_device = ldevice_orig;
-+
-+ ldev_begin = malloc( strlen( lock_device ) + 1 );
-+ sprintf( ldev_begin, "%s", lock_device );
-+ free( ldevice_orig );
-+
-+ return ldev_begin;
-+}
-+
- static char * get_lock_name _P2( (lock_name, device),
- char * lock_name, char * device )
- {
-+ char *lock;
- #ifdef LOCKS_LOWERCASE
- /* sco locking convention -> change all device names to lowercase */
-
-@@ -425,10 +458,10 @@
- #endif /* LOCKS_LOWERCASE */
-
- /* throw out all directory prefixes */
-- if ( strchr( device, '/' ) != NULL )
-- device = strrchr( device, '/' ) +1;
--
-- sprintf( lock_name, LOCK, device);
-+
-+ lock = unslash_name ( device );
-+ sprintf( lock_name, LOCK, lock );
-+ free ( lock );
-
- return lock_name;
- }